Commit 3556deeb authored by unknown's avatar unknown
Browse files

Bug #24121 Incorrect test for SSL_VERIFY_SERVER_CERT 

 - Change 'mysql_options' third argment "arg" to "const void*"


include/mysql.h:
  Change 'mysql_options' third argment "arg" to "const void*"
sql-common/client.c:
  Change 'mysql_options' third argment "arg" to "const void*"
parent a634875c

include/mysql.h

+1 −1
Original line number Diff line number Diff line
@@ -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_processes(MYSQL *mysql);

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_data_seek(MYSQL_RES *result,

					my_ulonglong offset);

sql-common/client.c

+1 −1
Original line number Diff line number Diff line
@@ -2948,7 +2948,7 @@ mysql_fetch_lengths(MYSQL_RES *res) 




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_PRINT("enter",("option: %d",(int) option));