--- libmysqld/client.c.orig	2007-03-29 14:16:29.000000000 +0200
+++ libmysqld/client.c	2007-03-29 14:16:58.000000000 +0200
@@ -2948,13 +2948,13 @@
   DBUG_PRINT("enter",("option: %d",(int) option));
   switch (option) {
   case MYSQL_OPT_CONNECT_TIMEOUT:
-    mysql->options.connect_timeout= *(uint*) arg;
+    mysql->options.connect_timeout= *arg;
     break;
   case MYSQL_OPT_READ_TIMEOUT:
-    mysql->options.read_timeout= *(uint*) arg;
+    mysql->options.read_timeout= *arg;
     break;
   case MYSQL_OPT_WRITE_TIMEOUT:
-    mysql->options.write_timeout= *(uint*) arg;
+    mysql->options.write_timeout= *arg;
     break;
   case MYSQL_OPT_COMPRESS:
     mysql->options.compress= 1;			/* Remember for connect */
@@ -2964,7 +2964,7 @@
     mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
     break;
   case MYSQL_OPT_LOCAL_INFILE:			/* Allow LOAD DATA LOCAL ?*/
-    if (!arg || test(*(uint*) arg))
+    if (!arg || test(*arg))
       mysql->options.client_flag|= CLIENT_LOCAL_FILES;
     else
       mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
@@ -2989,7 +2989,7 @@
     mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
     break;
   case MYSQL_OPT_PROTOCOL:
-    mysql->options.protocol= *(uint*) arg;
+    mysql->options.protocol= *arg;
     break;
   case MYSQL_SHARED_MEMORY_BASE_NAME:
 #ifdef HAVE_SMEM
@@ -3016,7 +3016,7 @@
     mysql->reconnect= *(my_bool *) arg;
     break;
   case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
-    if (!arg || test(*(uint*) arg))
+    if (!arg || test(*arg))
       mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
     else
       mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;
--- sql/client.c.orig	2007-03-29 14:13:04.000000000 +0200
+++ sql/client.c	2007-03-29 14:13:45.000000000 +0200
@@ -2948,13 +2948,13 @@
   DBUG_PRINT("enter",("option: %d",(int) option));
   switch (option) {
   case MYSQL_OPT_CONNECT_TIMEOUT:
-    mysql->options.connect_timeout= *(uint*) arg;
+    mysql->options.connect_timeout= *arg;
     break;
   case MYSQL_OPT_READ_TIMEOUT:
-    mysql->options.read_timeout= *(uint*) arg;
+    mysql->options.read_timeout= *arg;
     break;
   case MYSQL_OPT_WRITE_TIMEOUT:
-    mysql->options.write_timeout= *(uint*) arg;
+    mysql->options.write_timeout= *arg;
     break;
   case MYSQL_OPT_COMPRESS:
     mysql->options.compress= 1;			/* Remember for connect */
@@ -2964,7 +2964,7 @@
     mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
     break;
   case MYSQL_OPT_LOCAL_INFILE:			/* Allow LOAD DATA LOCAL ?*/
-    if (!arg || test(*(uint*) arg))
+    if (!arg || test(*arg))
       mysql->options.client_flag|= CLIENT_LOCAL_FILES;
     else
       mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
@@ -2989,7 +2989,7 @@
     mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
     break;
   case MYSQL_OPT_PROTOCOL:
-    mysql->options.protocol= *(uint*) arg;
+    mysql->options.protocol= *arg;
     break;
   case MYSQL_SHARED_MEMORY_BASE_NAME:
 #ifdef HAVE_SMEM
@@ -3016,7 +3016,7 @@
     mysql->reconnect= *(my_bool *) arg;
     break;
   case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
-    if (!arg || test(*(uint*) arg))
+    if (!arg || test(*arg))
       mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
     else
       mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;
--- sql-common/client.c.orig	2007-03-29 14:14:01.000000000 +0200
+++ sql-common/client.c	2007-03-29 14:14:35.000000000 +0200
@@ -2948,13 +2948,13 @@
   DBUG_PRINT("enter",("option: %d",(int) option));
   switch (option) {
   case MYSQL_OPT_CONNECT_TIMEOUT:
-    mysql->options.connect_timeout= *(uint*) arg;
+    mysql->options.connect_timeout= *arg;
     break;
   case MYSQL_OPT_READ_TIMEOUT:
-    mysql->options.read_timeout= *(uint*) arg;
+    mysql->options.read_timeout= *arg;
     break;
   case MYSQL_OPT_WRITE_TIMEOUT:
-    mysql->options.write_timeout= *(uint*) arg;
+    mysql->options.write_timeout= *arg;
     break;
   case MYSQL_OPT_COMPRESS:
     mysql->options.compress= 1;			/* Remember for connect */
@@ -2964,7 +2964,7 @@
     mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
     break;
   case MYSQL_OPT_LOCAL_INFILE:			/* Allow LOAD DATA LOCAL ?*/
-    if (!arg || test(*(uint*) arg))
+    if (!arg || test(*arg))
       mysql->options.client_flag|= CLIENT_LOCAL_FILES;
     else
       mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
@@ -2989,7 +2989,7 @@
     mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
     break;
   case MYSQL_OPT_PROTOCOL:
-    mysql->options.protocol= *(uint*) arg;
+    mysql->options.protocol= *arg;
     break;
   case MYSQL_SHARED_MEMORY_BASE_NAME:
 #ifdef HAVE_SMEM
@@ -3016,7 +3016,7 @@
     mysql->reconnect= *(my_bool *) arg;
     break;
   case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
-    if (!arg || test(*(uint*) arg))
+    if (!arg || test(*arg))
       mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
     else
       mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;