diff --git a/include/mysql.h b/include/mysql.h
index f76ae10ca16..33bdf80ef73 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -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);
diff --git a/sql-common/client.c b/sql-common/client.c
index 16fd20209b2..89d69b4bd1f 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -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));