Attachment 207367 Details for Bug 240484 – svn-diff-mysql-connector-odbc

[patch] svn-diff-mysql-connector-odbc

svn-diff-connector (text/plain), 2.26 KB, created by Walter Schwarzenfeld on 2019-09-11 03:21:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2019-09-11 03:21:59 UTC

Size: 2.26 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 511759)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mysql-connector-odbc
> PORTVERSION=	5.3.13
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	databases
> MASTER_SITES=	MYSQL/Connector-ODBC/5.3
> PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
>Index: files/patch-driver-dll.cc
>===================================================================
>--- files/patch-driver-dll.cc	(nonexistent)
>+++ files/patch-driver-dll.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- driver/dll.cc.orig	2019-09-10 15:17:37 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
>+ 
>+ /*
>
>Property changes on: files/patch-driver-dll.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-driver-handle.cc
>===================================================================
>--- files/patch-driver-handle.cc	(nonexistent)
>+++ files/patch-driver-handle.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- driver/handle.cc.orig	2019-09-11 03:11:12 UTC
>++++ driver/handle.cc
>+@@ -646,7 +646,7 @@ SQLRETURN SQL_API my_SQLFreeStmtExtended
>+ #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
>
>Property changes on: files/patch-driver-handle.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 240484: 207367