diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-29 15:19:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-29 15:19:17 +0200 |
| commit | b45c551ee32d0d5260f4958abf93efab1a4614a2 (patch) | |
| tree | a893a67bcb0cabaecd8986426798736bdda58a70 /client | |
| parent | 7dad53633762174405c5e84137801e10f930e71a (diff) | |
| download | mariadb-git-b45c551ee32d0d5260f4958abf93efab1a4614a2.tar.gz | |
MDEV-448 Memory loss warnings in mysqldump when more than one schema is dumped
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index c20d4947185..e9a7a66298e 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4180,6 +4180,7 @@ static int dump_all_databases() if (dump_all_tables_in_db(row[0])) result=1; } + mysql_free_result(tableres); if (seen_views) { if (mysql_query(mysql, "SHOW DATABASES") || @@ -4202,6 +4203,7 @@ static int dump_all_databases() if (dump_all_views_in_db(row[0])) result=1; } + mysql_free_result(tableres); } return result; } @@ -4330,8 +4332,6 @@ static int init_dumping(char *database, int init_func(char*)) check_io(md_result_file); } } - if (extended_insert) - init_dynamic_string_checked(&extended_row, "", 1024, 1024); return 0; } /* init_dumping */ @@ -5608,6 +5608,9 @@ int main(int argc, char **argv) if (opt_alltspcs) dump_all_tablespaces(); + if (extended_insert) + init_dynamic_string_checked(&extended_row, "", 1024, 1024); + if (opt_alldbs) { if (!opt_alltspcs && !opt_notspcs) |