diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 08:59:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-23 08:59:03 +0300 |
| commit | b61700c22104b513caa9a85e5c6529aa5f2bf4e4 (patch) | |
| tree | 23f776bd41e4388241ebb43eb8102ca6d36d1b4a /client/mysqldump.c | |
| parent | 70df2bef7acffed1e7da21ba7b9c644a32e36f3a (diff) | |
| parent | 725e47bfb524f4b1d29076c8777056bedd5f00ea (diff) | |
| download | mariadb-git-b61700c22104b513caa9a85e5c6529aa5f2bf4e4.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 810f4fc7beb..ca47f89268e 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2845,6 +2845,8 @@ static uint get_table_structure(char *table, char *db, char *table_type, my_free(scv_buff); + if (path) + my_fclose(sql_file, MYF(MY_WME)); DBUG_RETURN(0); } else @@ -5927,8 +5929,7 @@ static my_bool get_view_structure(char *table, char* db) dynstr_free(&ds_view); } - if (switch_character_set_results(mysql, default_charset)) - DBUG_RETURN(1); + switch_character_set_results(mysql, default_charset); /* If a separate .sql file was opened, close it now */ if (sql_file != md_result_file) |