Commit d3a2e432 authored by unknown's avatar unknown

BUG #7815 - Post-review fixes required for push.


client/mysqldump.c:
  BUG #7815
  
  Pre-push fixes requested per Sergei's review.
parent 96c43505
...@@ -2959,7 +2959,7 @@ static void print_value(FILE *file, MYSQL_RES *result, MYSQL_ROW row, ...@@ -2959,7 +2959,7 @@ static void print_value(FILE *file, MYSQL_RES *result, MYSQL_ROW row,
char check_if_ignore_table(const char *table_name, char *table_type) char check_if_ignore_table(const char *table_name, char *table_type)
{ {
bool result= IGNORE_NONE; char result= IGNORE_NONE;
char buff[FN_REFLEN+80], show_name_buff[FN_REFLEN]; char buff[FN_REFLEN+80], show_name_buff[FN_REFLEN];
MYSQL_RES *res; MYSQL_RES *res;
MYSQL_ROW row; MYSQL_ROW row;
...@@ -2977,7 +2977,7 @@ char check_if_ignore_table(const char *table_name, char *table_type) ...@@ -2977,7 +2977,7 @@ char check_if_ignore_table(const char *table_name, char *table_type)
fprintf(stderr, fprintf(stderr,
"-- Warning: Couldn't get status information for table %s (%s)\n", "-- Warning: Couldn't get status information for table %s (%s)\n",
table_name,mysql_error(sock)); table_name,mysql_error(sock));
DBUG_RETURN(IGNORE_NONE); /* assume table is ok */ DBUG_RETURN(result); /* assume table is ok */
} }
} }
if (!(row= mysql_fetch_row(res))) if (!(row= mysql_fetch_row(res)))
...@@ -2986,10 +2986,10 @@ char check_if_ignore_table(const char *table_name, char *table_type) ...@@ -2986,10 +2986,10 @@ char check_if_ignore_table(const char *table_name, char *table_type)
"Error: Couldn't read status information for table %s (%s)\n", "Error: Couldn't read status information for table %s (%s)\n",
table_name, mysql_error(sock)); table_name, mysql_error(sock));
mysql_free_result(res); mysql_free_result(res);
DBUG_RETURN(IGNORE_NONE); /* assume table is ok */ DBUG_RETURN(result); /* assume table is ok */
} }
if (!(row[1])) if (!(row[1]))
strcpy(table_type,"VIEW"); strmake(table_type,"VIEW", NAME_LEN-1);
else else
{ {
/* /*
...@@ -2998,7 +2998,7 @@ char check_if_ignore_table(const char *table_name, char *table_type) ...@@ -2998,7 +2998,7 @@ char check_if_ignore_table(const char *table_name, char *table_type)
these types, but we do want to use delayed inserts in the dump if these types, but we do want to use delayed inserts in the dump if
the table type is _NOT_ one of these types the table type is _NOT_ one of these types
*/ */
sprintf(table_type, "%s",row[1]); strmake(table_type, row[1], NAME_LEN-1);
if (opt_delayed) if (opt_delayed)
{ {
if (strcmp(table_type,"MyISAM") && if (strcmp(table_type,"MyISAM") &&
......
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