diff options
| author | piernov <piernov@piernov.org> | 2012-01-22 11:38:02 +0100 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-01-22 11:38:02 +0100 |
| commit | 50e5ce5b17e69be13228e2393c5804b0a79acfab (patch) | |
| tree | 9845fa9af128d7fdd791755bb2be320f3ba2be4e /myodbc/myodbc-shutdown.patch | |
| parent | 9626427c1a1d9c292fc519810c13b9a8073e777f (diff) | |
| parent | 8548e8d6882b55dfb509b18dedfb7db17630037d (diff) | |
| download | nutyx-extra-50e5ce5b17e69be13228e2393c5804b0a79acfab.tar.gz nutyx-extra-50e5ce5b17e69be13228e2393c5804b0a79acfab.tar.bz2 nutyx-extra-50e5ce5b17e69be13228e2393c5804b0a79acfab.tar.xz nutyx-extra-50e5ce5b17e69be13228e2393c5804b0a79acfab.zip | |
Merged with http://kiao.no-ip.info/NuTyX/git/nutyx-pakxe → Repository splitted → nutyx-extra
Diffstat (limited to 'myodbc/myodbc-shutdown.patch')
| -rw-r--r-- | myodbc/myodbc-shutdown.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/myodbc/myodbc-shutdown.patch b/myodbc/myodbc-shutdown.patch new file mode 100644 index 000000000..ec0cf3d36 --- /dev/null +++ b/myodbc/myodbc-shutdown.patch @@ -0,0 +1,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 + } + + |