diff --git a/client/mysqldump.c b/client/mysqldump.c
index 66bc4fcb896..c75f02353b4 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2398,6 +2398,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
   char new_table_name[NAME_LEN];
   DYNAMIC_STRING lock_tables_query;
   HASH dump_tables;
+  char *table_name;
 
   DBUG_ENTER("dump_selected_tables");
 
@@ -2457,7 +2458,6 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
     print_xml_tag1(md_result_file, "", "database name=", db, "\n");
 
   /* Dump each selected table */
-  const char *table_name;
   for (i= 0; i < dump_tables.records; i++)
   {
     table_name= hash_element(&dump_tables, i);
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 7fdaf1098c2..a7f9420df6d 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -994,10 +994,10 @@ static void do_exec(struct st_query* q)
       die("At line %u: command \"%s\" failed", start_lineno, cmd);
     else
     {
-      DBUG_PRINT("info",
-                 ("error: %d, status: %d", error, status));
       bool ok= 0;
       uint i;
+      DBUG_PRINT("info",
+                 ("error: %d, status: %d", error, status));
       for (i=0 ; (uint) i < q->expected_errors ; i++)
       {
         DBUG_PRINT("info", ("expected error: %d", q->expected_errno[i].code.errnum));