diff options
| author | acurtis@xiphis.org <> | 2005-12-25 03:29:49 -0800 |
|---|---|---|
| committer | acurtis@xiphis.org <> | 2005-12-25 03:29:49 -0800 |
| commit | 9aaa8a81eb011fe92eb1a9129d8f5f18a2e1a165 (patch) | |
| tree | fd599faa84df4b95805d8523e5bceda2530ae77d /sql | |
| parent | 795f744c5f1ba2d427128a7ecd3e12f1fe3cc0ff (diff) | |
| download | mariadb-git-9aaa8a81eb011fe92eb1a9129d8f5f18a2e1a165.tar.gz | |
Bug#15976: Multiply warnings about unfreed memory
leaks caused by Archive storage engine not closing files and
storage engines not receiving panic() during shutdown
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_archive.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc index 6cfb29537a2..dfc01d01a80 100644 --- a/sql/ha_archive.cc +++ b/sql/ha_archive.cc @@ -591,8 +591,6 @@ int ha_archive::create(const char *name, TABLE *table_arg, goto error2; } - my_close(create_file, MYF(0)); - DBUG_RETURN(0); error3: diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2a51afbee8d..a7f3d12af09 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1152,6 +1152,7 @@ void clean_up(bool print_message) lex_free(); /* Free some memory */ set_var_free(); free_charsets(); + (void) ha_panic(HA_PANIC_CLOSE); /* close all tables and logs */ if (!opt_noacl) { #ifdef HAVE_DLOPEN @@ -1159,7 +1160,6 @@ void clean_up(bool print_message) #endif plugin_free(); } - (void) ha_panic(HA_PANIC_CLOSE); /* close all tables and logs */ if (tc_log) tc_log->close(); xid_cache_free(); |