Date: Thu, 15 Jul 2021 10:11:51 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b3146d8194eb - main - databases/mysql-connector-odbc: unbreak the build against MySQL <5.7. Message-ID: <202107151011.16FABpfH049189@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3146d8194eb3ec694d6473d1eac38de1b4a3e7a commit b3146d8194eb3ec694d6473d1eac38de1b4a3e7a Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-07-15 10:10:36 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-07-15 10:10:55 +0000 databases/mysql-connector-odbc: unbreak the build against MySQL <5.7. PR: 240484 --- databases/mysql-connector-odbc/files/patch-driver_dll.cc | 11 +++++++++++ databases/mysql-connector-odbc/files/patch-driver_handle.cc | 11 +++++++++++ 2 files changed, 22 insertions(+) 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107151011.16FABpfH049189>