bk commit into 5.1 tree (msvensson:1.2511) BUG#24121

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-27 21:04:05+02:00, msvensson@stripped +2 -0
  Bug #24121  Incorrect test for SSL_VERIFY_SERVER_CERT
   - Change 'mysql_options' third argment "arg" to "const void*"

  include/mysql.h@stripped, 2007-03-27 21:04:04+02:00, msvensson@stripped +1 -1
    Change 'mysql_options' third argment "arg" to "const void*"

  sql-common/client.c@stripped, 2007-03-27 21:04:04+02:00, msvensson@stripped +1 -1
    Change 'mysql_options' third argment "arg" to "const void*"

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug24121/my51-bug24121

--- 1.177/include/mysql.h	2007-02-23 21:48:11 +01:00
+++ 1.178/include/mysql.h	2007-03-27 21:04:04 +02:00
@@ -525,7 +525,7 @@ MYSQL_RES *	STDCALL mysql_list_dbs(MYSQL
 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);

--- 1.127/sql-common/client.c	2007-03-27 19:26:26 +02:00
+++ 1.128/sql-common/client.c	2007-03-27 21:04:04 +02:00
@@ -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));