diff options
Diffstat (limited to 'databases/mysql-connector-odbc/files')
| -rw-r--r-- | databases/mysql-connector-odbc/files/patch-driver_dll.cc | 11 | ||||
| -rw-r--r-- | databases/mysql-connector-odbc/files/patch-include_mysql-8.0_my__sys.h | 24 |
2 files changed, 35 insertions, 0 deletions
diff --git a/databases/mysql-connector-odbc/files/patch-driver_dll.cc b/databases/mysql-connector-odbc/files/patch-driver_dll.cc new file mode 100644 index 000000000000..402d1b423879 --- /dev/null +++ b/databases/mysql-connector-odbc/files/patch-driver_dll.cc @@ -0,0 +1,11 @@ +--- driver/dll.cc.orig 2025-06-19 12:19:21 UTC ++++ driver/dll.cc +@@ -144,7 +144,7 @@ void myodbc_end() + This eliminates the delay when mysys_end() is called and other threads + have been initialized but not ended. + */ +- my_thread_end_wait_time= 0; ++ static uint my_thread_end_wait_time= 0; + #endif + /* + When driver is unloaded the plugin pool must be cleared. diff --git a/databases/mysql-connector-odbc/files/patch-include_mysql-8.0_my__sys.h b/databases/mysql-connector-odbc/files/patch-include_mysql-8.0_my__sys.h new file mode 100644 index 000000000000..265c31628422 --- /dev/null +++ b/databases/mysql-connector-odbc/files/patch-include_mysql-8.0_my__sys.h @@ -0,0 +1,24 @@ +--- include/mysql-8.0/my_sys.h.orig 2025-06-19 12:19:21 UTC ++++ include/mysql-8.0/my_sys.h +@@ -41,8 +41,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + #include "my_config.h" + + #ifdef HAVE_ALLOCA_H ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) ++#include <stdlib.h> ++#else + #include <alloca.h> + #endif ++#endif + #include <limits.h> + #ifdef _WIN32 + #include <malloc.h> +@@ -332,6 +336,8 @@ typedef int (*IO_CACHE_CALLBACK)(IO_CACHE *); + + struct IO_CACHE; + typedef int (*IO_CACHE_CALLBACK)(IO_CACHE *); ++ ++typedef unsigned long ulong; + + struct IO_CACHE_SHARE { + mysql_mutex_t mutex; /* To sync on reads into buffer. */ |