Bug #24121 Incorrect test for SSL_VERIFY_SERVER_CERT

 - Change 'mysql_options' third argment "arg" to "const void*"
parent 0559be34
...@@ -525,7 +525,7 @@ MYSQL_RES * STDCALL mysql_list_dbs(MYSQL *mysql,const char *wild); ...@@ -525,7 +525,7 @@ MYSQL_RES * STDCALL mysql_list_dbs(MYSQL *mysql,const char *wild);
MYSQL_RES * STDCALL mysql_list_tables(MYSQL *mysql,const char *wild); MYSQL_RES * STDCALL mysql_list_tables(MYSQL *mysql,const char *wild);
MYSQL_RES * STDCALL mysql_list_processes(MYSQL *mysql); MYSQL_RES * STDCALL mysql_list_processes(MYSQL *mysql);
int STDCALL mysql_options(MYSQL *mysql,enum mysql_option option, int STDCALL mysql_options(MYSQL *mysql,enum mysql_option option,
const char *arg); const void *arg);
void STDCALL mysql_free_result(MYSQL_RES *result); void STDCALL mysql_free_result(MYSQL_RES *result);
void STDCALL mysql_data_seek(MYSQL_RES *result, void STDCALL mysql_data_seek(MYSQL_RES *result,
my_ulonglong offset); my_ulonglong offset);
......
...@@ -2948,7 +2948,7 @@ mysql_fetch_lengths(MYSQL_RES *res) ...@@ -2948,7 +2948,7 @@ mysql_fetch_lengths(MYSQL_RES *res)
int STDCALL int STDCALL
mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg) mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
{ {
DBUG_ENTER("mysql_option"); DBUG_ENTER("mysql_option");
DBUG_PRINT("enter",("option: %d",(int) option)); DBUG_PRINT("enter",("option: %d",(int) option));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment