Commit 523c888d authored by unknown's avatar unknown

Merge damiendev.:C:/build/dev50

into  damiendev.:C:/build/mysql-5.1


client/mysqldump.c:
  Auto merged
parents ecd9c1f4 df5cc449
...@@ -1699,8 +1699,9 @@ static uint dump_routines_for_db(char *db) ...@@ -1699,8 +1699,9 @@ static uint dump_routines_for_db(char *db)
my_free(query_str, MYF(MY_ALLOW_ZERO_PTR)); my_free(query_str, MYF(MY_ALLOW_ZERO_PTR));
} }
} /* end of routine printing */ } /* end of routine printing */
mysql_free_result(routine_res);
} /* end of list of routines */ } /* end of list of routines */
mysql_free_result(routine_res);
} }
mysql_free_result(routine_list_res); mysql_free_result(routine_list_res);
} /* end of for i (0 .. 1) */ } /* end of for i (0 .. 1) */
...@@ -3794,7 +3795,7 @@ char check_if_ignore_table(const char *table_name, char *table_type) ...@@ -3794,7 +3795,7 @@ char check_if_ignore_table(const char *table_name, char *table_type)
{ {
char 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= NULL;
MYSQL_ROW row; MYSQL_ROW row;
DBUG_ENTER("check_if_ignore_table"); DBUG_ENTER("check_if_ignore_table");
......
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