Commit 4b0f9874 authored by unknown's avatar unknown

Fixed compiler errors (i.e. changed C++-isms into C)


client/mysqldump.c:
  Moved variable declaration to beginning of block (and removed const to get rid of warnings).
client/mysqltest.c:
  Moved DBUG_PRINT after variable declarations.
parent 84aa570d
...@@ -2398,6 +2398,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables) ...@@ -2398,6 +2398,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
char new_table_name[NAME_LEN]; char new_table_name[NAME_LEN];
DYNAMIC_STRING lock_tables_query; DYNAMIC_STRING lock_tables_query;
HASH dump_tables; HASH dump_tables;
char *table_name;
DBUG_ENTER("dump_selected_tables"); DBUG_ENTER("dump_selected_tables");
...@@ -2457,7 +2458,6 @@ static int dump_selected_tables(char *db, char **table_names, int 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"); print_xml_tag1(md_result_file, "", "database name=", db, "\n");
/* Dump each selected table */ /* Dump each selected table */
const char *table_name;
for (i= 0; i < dump_tables.records; i++) for (i= 0; i < dump_tables.records; i++)
{ {
table_name= hash_element(&dump_tables, i); table_name= hash_element(&dump_tables, i);
......
...@@ -994,10 +994,10 @@ static void do_exec(struct st_query* q) ...@@ -994,10 +994,10 @@ static void do_exec(struct st_query* q)
die("At line %u: command \"%s\" failed", start_lineno, cmd); die("At line %u: command \"%s\" failed", start_lineno, cmd);
else else
{ {
DBUG_PRINT("info",
("error: %d, status: %d", error, status));
bool ok= 0; bool ok= 0;
uint i; uint i;
DBUG_PRINT("info",
("error: %d, status: %d", error, status));
for (i=0 ; (uint) i < q->expected_errors ; i++) for (i=0 ; (uint) i < q->expected_errors ; i++)
{ {
DBUG_PRINT("info", ("expected error: %d", q->expected_errno[i].code.errnum)); DBUG_PRINT("info", ("expected error: %d", q->expected_errno[i].code.errnum));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment