diff options
| author | unknown <monty@mysql.com> | 2004-12-09 12:50:37 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-09 12:50:37 +0200 |
| commit | 3e221a83f4cfb4955b85f9c38bfc98c46713ca08 (patch) | |
| tree | 49788ebcca263e788635ac4fcde7f856f171be0b /client | |
| parent | cbd5d91c087213a8215895c7fa03ee706b084581 (diff) | |
| parent | 5535fa96fbbee28558bb2fccbc8eecf4872b37ff (diff) | |
| download | mariadb-git-3e221a83f4cfb4955b85f9c38bfc98c46713ca08.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
client/mysqldump.c:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index b4fa293c19c..11892a3458f 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1825,8 +1825,6 @@ static void dumpTable(uint numFields, char *table) err: if (query != query_buf) my_free(query, MYF(MY_ALLOW_ZERO_PTR)); - if (order_by) - my_free(order_by, MYF(0)); safe_exit(error); return; } /* dumpTable */ @@ -1978,6 +1976,8 @@ static int dump_all_tables_in_db(char *database) numrows = getTableStructure(table, database); if (!dFlag && numrows > 0) dumpTable(numrows,table); + my_free(order_by, MYF(MY_ALLOW_ZERO_PTR)); + order_by= 0; } if (opt_xml) { @@ -2027,6 +2027,8 @@ static int dump_selected_tables(char *db, char **table_names, int tables) numrows = getTableStructure(*table_names, db); if (!dFlag && numrows > 0) dumpTable(numrows, *table_names); + my_free(order_by, MYF(MY_ALLOW_ZERO_PTR)); + order_by= 0; } if (opt_xml) { |