From owner-dev-commits-ports-all@freebsd.org Thu Jul 15 10:11:51 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 72A106639FC; Thu, 15 Jul 2021 10:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQVXR2qtSz4Xk5; Thu, 15 Jul 2021 10:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 48D8C270F2; Thu, 15 Jul 2021 10:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16FABpJN049190; Thu, 15 Jul 2021 10:11:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16FABpfH049189; Thu, 15 Jul 2021 10:11:51 GMT (envelope-from git) Date: Thu, 15 Jul 2021 10:11:51 GMT Message-Id: <202107151011.16FABpfH049189@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: b3146d8194eb - main - databases/mysql-connector-odbc: unbreak the build against MySQL <5.7. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3146d8194eb3ec694d6473d1eac38de1b4a3e7a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 10:11:51 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3146d8194eb3ec694d6473d1eac38de1b4a3e7a commit b3146d8194eb3ec694d6473d1eac38de1b4a3e7a Author: Alexey Dokuchaev AuthorDate: 2021-07-15 10:10:36 +0000 Commit: Alexey Dokuchaev 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