=== modified file 'libmysql/libmysql.c'
--- libmysql/libmysql.c	2010-01-18 20:19:19 +0000
+++ libmysql/libmysql.c	2010-02-17 22:28:56 +0000
@@ -1906,7 +1903,7 @@ mysql_stmt_param_metadata(MYSQL_STMT *st
 
 /* Store type of parameter in network buffer. */
 
-static void store_param_type(unsigned char **pos, MYSQL_BIND *param)
+static void store_param_type(char **pos, MYSQL_BIND *param)
 {
   uint typecode= param->buffer_type | (param->is_unsigned ? 32768 : 0);
   int2store(*pos, typecode);
@@ -2185,7 +2182,7 @@ int cli_stmt_execute(MYSQL_STMT *stmt)
 	that is sent to the server.
       */
       for (param= stmt->params;	param < param_end ; param++)
-        store_param_type(&net->write_pos, param);
+        store_param_type((char**) &net->write_pos, param);
     }
 
     for (param= stmt->params; param < param_end; param++)

=== modified file 'mysys/default.c'
--- mysys/default.c	2009-12-24 07:56:13 +0000
+++ mysys/default.c	2010-02-17 22:28:56 +0000
@@ -683,7 +683,7 @@ static int search_default_file_with_ext(
                                         int recursion_level)
 {
   char name[FN_REFLEN + 10], buff[4096], curr_gr[4096], *ptr, *end, **tmp_ext;
-  char *value, option[4096+2], tmp[FN_REFLEN];
+  char *value, option[4096], tmp[FN_REFLEN];
   static const char includedir_keyword[]= "includedir";
   static const char include_keyword[]= "include";
   const int max_recursion_level= 10;

=== modified file 'sql/sql_connect.cc'
--- sql/sql_connect.cc	2010-01-25 16:48:45 +0000
+++ sql/sql_connect.cc	2010-02-17 22:28:56 +0000
@@ -727,7 +727,7 @@ static int check_connection(THD *thd)
   ulong server_capabilites;
   {
     /* buff[] needs to big enough to hold the server_version variable */
-    char buff[SERVER_VERSION_LENGTH + 1 + SCRAMBLE_LENGTH + 1 + 64];
+    char buff[SERVER_VERSION_LENGTH + SCRAMBLE_LENGTH + 64];
     server_capabilites= CLIENT_BASIC_FLAGS;
 
     if (opt_using_transactions)