Connector/ODBC 3.51 commit: r976 - in trunk: cmake driver

[jwinstead]

Modified:
   trunk/cmake/FindMySQL.cmake
   trunk/driver/Makefile.am
   trunk/driver/dll.c
Log:
Remove references to old MYODBC_DBG define, and use a new define to
determine when we are linking with the non-threadsafe libmysql and
my_thread_end_wait_time will not be available.


Modified: trunk/cmake/FindMySQL.cmake
===================================================================
--- trunk/cmake/FindMySQL.cmake	2008-01-02 19:23:07 UTC (rev 975)
+++ trunk/cmake/FindMySQL.cmake	2008-01-02 22:55:43 UTC (rev 976)
@@ -43,7 +43,6 @@
 	IF (CMAKE_BUILD_TYPE STREQUAL Debug)
 		SET(libsuffixDist debug)
 		SET(libsuffixBuild Debug)
-		ADD_DEFINITIONS(-DMYODBC_DBG)
 	ELSE (CMAKE_BUILD_TYPE STREQUAL Debug)
 		SET(libsuffixDist opt)
 		SET(libsuffixBuild Release)

Modified: trunk/driver/Makefile.am
===================================================================
--- trunk/driver/Makefile.am	2008-01-02 19:23:07 UTC (rev 975)
+++ trunk/driver/Makefile.am	2008-01-02 22:55:43 UTC (rev 976)
@@ -70,10 +70,7 @@
 # Linker and preprocessor options                                 #
 #                                                                 #
 ###################################################################
-if WITH_DEBUG
-libmyodbc3_la_CPPFLAGS       = -DMYODBC_DBG
-libmyodbc3_r_la_CPPFLAGS     = -DMYODBC_DBG
-endif
+libmyodbc3_la_CPPFLAGS       = -DNONTHREADSAFE
 
 libmyodbc3_la_LDFLAGS       = -release @myodbc_version@ -module 
 libmyodbc3_r_la_LDFLAGS     = -release @myodbc_version@ -module 

Modified: trunk/driver/dll.c
===================================================================
--- trunk/driver/dll.c	2008-01-02 19:23:07 UTC (rev 975)
+++ trunk/driver/dll.c	2008-01-02 22:55:43 UTC (rev 976)
@@ -95,8 +95,9 @@
     my_free(thousands_sep,MYF(0));
 
     /* my_thread_end_wait_time was added in 5.1.14 and 5.0.32 */
-#if defined(THREAD) && (MYSQL_VERSION_ID >= 50114 || \
-                        (MYSQL_VERSION_ID >= 50032 && MYSQL_VERSION_ID <
50100))
+#if !defined(NONTHREADSAFE) && \
+    (MYSQL_VERSION_ID >= 50114 || \
+     (MYSQL_VERSION_ID >= 50032 && MYSQL_VERSION_ID < 50100))
     /*
        This eliminates the delay when my_end() is called and other threads
        have been initialized but not ended.