summaryrefslogtreecommitdiffstats
path: root/myodbc/myodbc-shutdown.patch
blob: ec0cf3d36ff2df9b21cf04455b86b9d192eecb32 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
myodbc_end is really only usable during Windows DLL unload, since it's not
connection-specific and not thread-safe either.  This bit of brain fade
accounts for our bug #185343 and several bugs filed at mysql.com.

Furthermore, my_end() isn't exported from libmysqlclient anymore.
Hence, best fix is to turn the function into a no-op.


diff -Naur mysql-connector-odbc-5.1.8.orig/driver/dll.c mysql-connector-odbc-5.1.8/driver/dll.c
--- mysql-connector-odbc-5.1.8.orig/driver/dll.c	2010-10-28 14:33:18.000000000 -0400
+++ mysql-connector-odbc-5.1.8/driver/dll.c	2010-12-23 15:05:49.394608226 -0500
@@ -94,6 +94,7 @@
 */
 void myodbc_end()
 {
+#if 0
   if (!--myodbc_inited)
   {
     my_free(decimal_point,MYF(0));
@@ -121,6 +122,7 @@
     my_end(0);
 #endif
   }
+#endif
 }