mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 00:30:33 -04:00
771335e2e8
With MariaDB 10.2.6 the Connect/C is updated to ~3.0. This means the C interface changed slightly and some functions are changed. - Replace direct struct access with accessor in _mysql.c - Add LICENSE/LICENSE_FILE - Strip Binaries - Remove conflict with itself PR: 219797 Reviewed_by: sunpoet, koobs, brnrd Submitted by: sirl33tname@gmail.com Approved by: koobs (python) Differential Revision: https://reviews.freebsd.org/D11054
24 lines
703 B
C
24 lines
703 B
C
--- _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
|
|
+#define HAVE_OPENSSL 1
|
|
+#endif
|
|
+
|
|
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
|