Fix compile warnings.

client/client_priv.h

@@ -82,7 +82,3 @@ enum options_client
   OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
   OPT_WRITE_BINLOG, OPT_MAX_CLIENT_OPTION
 };
-
-C_MODE_START
-extern int mysql_init_character_set(MYSQL *mysql);
-C_MODE_END

client/mysqltest.c

@@ -1507,7 +1507,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
     die("Failed to create temporary file for ds");
 
   /* Write ds to temporary file and set file pos to beginning*/
-  if (my_write(fd, ds->str, ds->length,
+  if (my_write(fd, (uchar *) ds->str, ds->length,
                MYF(MY_FNABP | MY_WME)) ||
       my_seek(fd, 0, SEEK_SET, MYF(0)) == MY_FILEPOS_ERROR)
   {
@@ -1984,9 +1984,11 @@ void var_set_query_get_value(struct st_command *command, VAR *var)
   static DYNAMIC_STRING ds_col;
   static DYNAMIC_STRING ds_row;
   const struct command_arg query_get_value_args[] = {
-    "query", ARG_STRING, TRUE, &ds_query, "Query to run",
-    "column name", ARG_STRING, TRUE, &ds_col, "Name of column",
-    "row number", ARG_STRING, TRUE, &ds_row, "Number for row",
+    {
+      "query", ARG_STRING, TRUE, &ds_query, "Query to run",
+      "column name", ARG_STRING, TRUE, &ds_col, "Name of column",
+      "row number", ARG_STRING, TRUE, &ds_row, "Number for row"
+    }
   };
 
   DBUG_ENTER("var_set_query_get_value");

libmysql/client_settings.h

@@ -63,3 +63,7 @@ int cli_read_change_user_result(MYSQL *mysql, char *buff, const char *passwd);
 int init_embedded_server(int argc, char **argv, char **groups);
 void end_embedded_server();
 #endif /*EMBEDDED_LIBRARY*/
+
+C_MODE_START
+extern int mysql_init_character_set(MYSQL *mysql);
+C_MODE_END

libmysql/libmysql.c

@@ -2526,7 +2526,7 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length)
              5 /* execution flags */];
   my_bool res;
   DBUG_ENTER("execute");
-  DBUG_DUMP("packet", packet, length);
+  DBUG_DUMP("packet", (uchar *) packet, length);
 
   mysql->last_used_con= mysql;
   int4store(buff, stmt->stmt_id);		/* Send stmt id to server */
@@ -4702,14 +4702,14 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
   MYSQL_ROWS *cur, **prev_ptr= &result->data;
   NET        *net;
 
+  DBUG_ENTER("cli_read_binary_rows");
+
   if (!mysql)
   {
     set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
     return 1;
   }
 
-  DBUG_ENTER("cli_read_binary_rows");
-
   net = &mysql->net;
   mysql= mysql->last_used_con;