python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-14 18:12:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support MySQL 8.3 (#690)

Browse Source 
Fix #688
This commit is contained in:
Inada Naoki
2024-02-03 19:16:26 +09:00
committed by GitHub
parent 9e3b00fe19
commit 720b80497f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/MySQLdb/_mysql.c
View File

@ -524,8 +524,13 @@ _mysql_ConnectionObject_Initialize(
mysql_options(&(self->connection), MYSQL_OPT_LOCAL_INFILE, (char *) &local_infile); mysql_options(&(self->connection), MYSQL_OPT_LOCAL_INFILE, (char *) &local_infile);
if (ssl) { if (ssl) {
mysql_ssl_set(&(self->connection), key, cert, ca, capath, cipher); mysql_options(&(self->connection), MYSQL_OPT_SSL_KEY, key);
mysql_options(&(self->connection), MYSQL_OPT_SSL_CERT, cert);
mysql_options(&(self->connection), MYSQL_OPT_SSL_CA, ca);
mysql_options(&(self->connection), MYSQL_OPT_SSL_CAPATH, capath);
mysql_options(&(self->connection), MYSQL_OPT_SSL_CIPHER, cipher);
} }
if (ssl_mode) { if (ssl_mode) {
#ifdef HAVE_ENUM_MYSQL_OPT_SSL_MODE #ifdef HAVE_ENUM_MYSQL_OPT_SSL_MODE
mysql_options(&(self->connection), MYSQL_OPT_SSL_MODE, &ssl_mode_num); mysql_options(&(self->connection), MYSQL_OPT_SSL_MODE, &ssl_mode_num);
@ -1789,10 +1794,11 @@ _mysql_ConnectionObject_kill(
{ {
unsigned long pid; unsigned long pid;
int r; int r;
char query[50];
if (!PyArg_ParseTuple(args, "k:kill", &pid)) return NULL; if (!PyArg_ParseTuple(args, "k:kill", &pid)) return NULL;
check_connection(self); check_connection(self);
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
r = mysql_kill(&(self->connection), pid); r = mysql_query(&(self->connection), snprintf(query, 50, "KILL %d", pid));
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (r) return _mysql_Exception(self); if (r) return _mysql_Exception(self);
Py_RETURN_NONE; Py_RETURN_NONE;
@ -2008,7 +2014,7 @@ _mysql_ConnectionObject_shutdown(
int r; int r;
check_connection(self); check_connection(self);
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
r = mysql_shutdown(&(self->connection), SHUTDOWN_DEFAULT); r = mysql_query(&(self->connection), "SHUTDOWN");
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (r) return _mysql_Exception(self); if (r) return _mysql_Exception(self);
Py_RETURN_NONE; Py_RETURN_NONE;