@@ -524,8 +524,13 @@ _mysql_ConnectionObject_Initialize(
524
524
mysql_options (& (self -> connection ), MYSQL_OPT_LOCAL_INFILE , (char * ) & local_infile );
525
525
526
526
if (ssl ) {
527
- mysql_ssl_set (& (self -> connection ), key , cert , ca , capath , cipher );
527
+ mysql_options (& (self -> connection ), MYSQL_OPT_SSL_KEY , key );
528
+ mysql_options (& (self -> connection ), MYSQL_OPT_SSL_CERT , cert );
529
+ mysql_options (& (self -> connection ), MYSQL_OPT_SSL_CA , ca );
530
+ mysql_options (& (self -> connection ), MYSQL_OPT_SSL_CAPATH , capath );
531
+ mysql_options (& (self -> connection ), MYSQL_OPT_SSL_CIPHER , cipher );
528
532
}
533
+
529
534
if (ssl_mode ) {
530
535
#ifdef HAVE_ENUM_MYSQL_OPT_SSL_MODE
531
536
mysql_options (& (self -> connection ), MYSQL_OPT_SSL_MODE , & ssl_mode_num );
@@ -1789,10 +1794,11 @@ _mysql_ConnectionObject_kill(
1789
1794
{
1790
1795
unsigned long pid ;
1791
1796
int r ;
1797
+ char query [50 ];
1792
1798
if (!PyArg_ParseTuple (args , "k:kill" , & pid )) return NULL ;
1793
1799
check_connection (self );
1794
1800
Py_BEGIN_ALLOW_THREADS
1795
- r = mysql_kill (& (self -> connection ), pid );
1801
+ r = mysql_query (& (self -> connection ), snprintf ( query , 50 , "KILL %d" , pid ) );
1796
1802
Py_END_ALLOW_THREADS
1797
1803
if (r ) return _mysql_Exception (self );
1798
1804
Py_RETURN_NONE ;
@@ -2008,7 +2014,7 @@ _mysql_ConnectionObject_shutdown(
2008
2014
int r ;
2009
2015
check_connection (self );
2010
2016
Py_BEGIN_ALLOW_THREADS
2011
- r = mysql_shutdown (& (self -> connection ), SHUTDOWN_DEFAULT );
2017
+ r = mysql_query (& (self -> connection ), "SHUTDOWN" );
2012
2018
Py_END_ALLOW_THREADS
2013
2019
if (r ) return _mysql_Exception (self );
2014
2020
Py_RETURN_NONE ;
0 commit comments