tdbc::mysql

Check-in [6313038acf]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Use the right var to access the mysqlStubLibNames array. Closes [f3c6ec0369]. I think functional changes and whitespace cleanups should be done seperately. It's easy for something small to slip by in a big diff.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6313038acfb861436562d7954201cc23450b845a
User & Date: stu 2017-05-26 06:05:11
References
2017-05-26
06:13 Closed ticket [f3c6ec0369]: segfault on Linux when no mysql libs available plus 7 other changes artifact: d31195c185 user: stu
Context
2017-05-26
14:35
Give the (U)INT2PTR / PTR2(U)INT macros .h file a more descriptive name and fully integrate them into the configure/build/dist. Tidy some CPP bits to make them like the other tdbc-* modules. Closes ticket [60999d7b92]. check-in: 5dd83c8551 user: stu tags: trunk
06:05
Use the right var to access the mysqlStubLibNames array. Closes [f3c6ec0369]. I think functional changes and whitespace cleanups should be done seperately. It's easy for something small to slip by in a big diff. check-in: 6313038acf user: stu tags: trunk
2017-05-23
18:49
merge tdbcmysql-stwo check-in: 11877bd0a9 user: stu tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/mysqlStubInit.c.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
...
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
/*
 * mysqlStubInit.c --
 *
 *	Stubs tables for the foreign MySQL libraries so that
 *	Tcl extensions can use them without the linker's knowing about them.
 *
 * @[email protected] 2015-06-26 08:46:10Z by genExtStubs.tcl from ../generic/mysqlStubDefs.txt
 *
 * Copyright (c) 2010 by Kevin B. Kenny.
 *
 * Please refer to the file, 'license.terms' for the conditions on
 * redistribution of this file and for a DISCLAIMER OF ALL WARRANTIES.
 *
 *-----------------------------------------------------------------------------
................................................................................

    /* Walk the list of possible library names to find an MySQL client */

    status = TCL_ERROR;
    for (i = 0; status == TCL_ERROR && mysqlStubLibNames[i] != NULL; ++i) {
	for (j = 0; status == TCL_ERROR && (j < sizeof(mysqlSuffixes)/sizeof(mysqlSuffixes[0])); ++j) {
	    path = Tcl_NewStringObj(LIBPREFIX, -1);
	    Tcl_AppendToObj(path, mysqlStubLibNames[j], -1);
#ifdef __CYGWIN__
	    if (*mysqlSuffixes[j]) {
		Tcl_AppendToObj(path, "-", -1);
		Tcl_AppendToObj(path, mysqlSuffixes[j]+1, -1);
	    }
#endif
	    Tcl_AppendObjToObj(path, shlibext);





|







 







|







1
2
3
4
5
6
7
8
9
10
11
12
13
14
...
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
/*
 * mysqlStubInit.c --
 *
 *	Stubs tables for the foreign MySQL libraries so that
 *	Tcl extensions can use them without the linker's knowing about them.
 *
 * @[email protected] 2017-05-26 05:57:32Z by genExtStubs.tcl from ../generic/mysqlStubDefs.txt
 *
 * Copyright (c) 2010 by Kevin B. Kenny.
 *
 * Please refer to the file, 'license.terms' for the conditions on
 * redistribution of this file and for a DISCLAIMER OF ALL WARRANTIES.
 *
 *-----------------------------------------------------------------------------
................................................................................

    /* Walk the list of possible library names to find an MySQL client */

    status = TCL_ERROR;
    for (i = 0; status == TCL_ERROR && mysqlStubLibNames[i] != NULL; ++i) {
	for (j = 0; status == TCL_ERROR && (j < sizeof(mysqlSuffixes)/sizeof(mysqlSuffixes[0])); ++j) {
	    path = Tcl_NewStringObj(LIBPREFIX, -1);
	    Tcl_AppendToObj(path, mysqlStubLibNames[i], -1);
#ifdef __CYGWIN__
	    if (*mysqlSuffixes[j]) {
		Tcl_AppendToObj(path, "-", -1);
		Tcl_AppendToObj(path, mysqlSuffixes[j]+1, -1);
	    }
#endif
	    Tcl_AppendObjToObj(path, shlibext);

Changes to generic/mysqlStubs.h.

2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
 *-----------------------------------------------------------------------------
 *
 * ../generic/mysqlStubs.h --
 *
 *	Stubs for procedures in mysqlStubDefs.txt
 *
 * Generated by genExtStubs.tcl: DO NOT EDIT
 * 2015-06-26 08:46:09Z
 *
 *-----------------------------------------------------------------------------
 */

typedef struct mysqlStubDefs {

    /* Functions from libraries: mysqlclient_r mysqlclient mysql */






|







2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
 *-----------------------------------------------------------------------------
 *
 * ../generic/mysqlStubs.h --
 *
 *	Stubs for procedures in mysqlStubDefs.txt
 *
 * Generated by genExtStubs.tcl: DO NOT EDIT
 * 2017-05-26 05:57:32Z
 *
 *-----------------------------------------------------------------------------
 */

typedef struct mysqlStubDefs {

    /* Functions from libraries: mysqlclient_r mysqlclient mysql */