mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Bug #24121 Incorrect test for SSL_VERIFY_SERVER_CERT
- Change 'mysql_options' third argment "arg" to "const void*"
This commit is contained in:
@@ -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)
|
|||||||
|
|
||||||
|
|
||||||
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));
|
||||||
|
Reference in New Issue
Block a user