diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-07-15 10:10:36 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-07-15 10:10:55 +0000 |
| commit | b3146d8194eb3ec694d6473d1eac38de1b4a3e7a (patch) | |
| tree | 5d8f1a4b3f61c3bda994e780788e3cef5ebd6534 /databases/mysql-connector-odbc | |
| parent | multimedia/mpc-qt: sort USE_* (diff) | |
databases/mysql-connector-odbc: unbreak the build against MySQL <5.7.
PR: 240484
Diffstat (limited to 'databases/mysql-connector-odbc')
| -rw-r--r-- | databases/mysql-connector-odbc/files/patch-driver_dll.cc | 11 | ||||
| -rw-r--r-- | databases/mysql-connector-odbc/files/patch-driver_handle.cc | 11 |
2 files changed, 22 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..b69ce6b9e812 --- /dev/null +++ b/databases/mysql-connector-odbc/files/patch-driver_dll.cc @@ -0,0 +1,11 @@ +--- driver/dll.cc.orig 2019-04-15 16:56:34 UTC ++++ driver/dll.cc +@@ -125,7 +125,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 + + /* diff --git a/databases/mysql-connector-odbc/files/patch-driver_handle.cc b/databases/mysql-connector-odbc/files/patch-driver_handle.cc new file mode 100644 index 000000000000..3a12e522fa4e --- /dev/null +++ b/databases/mysql-connector-odbc/files/patch-driver_handle.cc @@ -0,0 +1,11 @@ +--- driver/handle.cc.orig 2019-04-15 16:56:34 UTC ++++ driver/handle.cc +@@ -646,7 +646,7 @@ SQLRETURN SQL_API my_SQLFreeStmtExtended(SQLHSTMT hstm + #if MYSQL_VERSION_ID >= 50722 && MYSQL_VERSION_ID < 80000 + if (stmt->result != NULL + #else +- if((stmt->result != NULL) && (stmt->result->field_alloc != NULL) ++ if((stmt->result != NULL) && (&stmt->result->field_alloc != NULL) + #if (!MYSQLCLIENT_STATIC_LINKING || !MYSQL8) + && (stmt->result->field_alloc.pre_alloc != NULL ) + #endif |