database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge damiendev.:C:/build/dev50

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


client/mysqldump.c:
  Auto merged
This commit is contained in:
unknown
2007-03-23 18:22:57 -04:00
parent dea1ffda10 139c950f11
commit 09d6be9580
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysqldump.c
View File

@ -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)
{ {
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");