FreeBSD Bugzilla – Attachment 184640 Details for
Bug 219797
databases/py-MySQLdb: Fails to build with MariaDB 10.2.6
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn diff for databases/py-MySQLdb
patch-databases_py-MySQLdb-PR219797 (text/plain), 1.19 KB, created by
Bernard Spil
on 2017-07-23 19:46:20 UTC
(
hide
)
Description:
svn diff for databases/py-MySQLdb
Filename:
MIME Type:
Creator:
Bernard Spil
Created:
2017-07-23 19:46:20 UTC
Size:
1.19 KB
patch
obsolete
>Index: databases/py-MySQLdb/files/patch-_mysql.c >=================================================================== >--- databases/py-MySQLdb/files/patch-_mysql.c (revision 446465) >+++ databases/py-MySQLdb/files/patch-_mysql.c (working copy) >@@ -1,7 +1,7 @@ >---- _mysql.c.orig 2014-03-18 19:07:07.000000000 +0400 >-+++ _mysql.c 2014-03-18 19:07:40.000000000 +0400 >-@@ -102,6 +102,10 @@ static int _mysql_server_init_done = 0; >- #define check_server_init(x) if (!_mysql_server_init_done) _mysql_server_init_done = 1 >+--- _mysql.c.orig 2014-01-02 19:15:03 UTC >++++ _mysql.c >+@@ -124,6 +124,10 @@ static int _mysql_server_init_done = 0; >+ #define HAVE_MYSQL_OPT_TIMEOUTS 1 > #endif > > +#if MYSQL_VERSION_ID >= 50500 >@@ -11,3 +11,14 @@ > PyObject * > _mysql_Exception(_mysql_ConnectionObject *c) > { >+@@ -2002,7 +2006,9 @@ _mysql_ConnectionObject_ping( >+ int r, reconnect = -1; >+ if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL; >+ check_connection(self); >+- if ( reconnect != -1 ) self->connection.reconnect = reconnect; >++ if (reconnect != -1) { >++ mysql_options(&self->connection, MYSQL_OPT_RECONNECT, &reconnect); >++ } >+ Py_BEGIN_ALLOW_THREADS >+ r = mysql_ping(&(self->connection)); >+ Py_END_ALLOW_THREADS
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 219797
:
183258
| 184640