diff options
| author | unknown <davi@endora.local> | 2007-11-20 15:18:57 -0200 |
|---|---|---|
| committer | unknown <davi@endora.local> | 2007-11-20 15:18:57 -0200 |
| commit | 7cf04ced45d74045e0c8dc7c5824562d8c0646b4 (patch) | |
| tree | a49662c04a5c8b99e4da282b89295a4521dc234f /sql/sql_class.cc | |
| parent | d87ae86bc6637efb508feb692c2eb8d4dcebc124 (diff) | |
| parent | 4d6543a6f08561fa6aa773d688e00c1766a80058 (diff) | |
| download | mariadb-git-7cf04ced45d74045e0c8dc7c5824562d8c0646b4.tar.gz | |
Merge endora.local:/Users/davi/mysql/bugs/31397-5.1
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 368ed897a4d..b1db831318c 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -678,9 +678,7 @@ void THD::cleanup(void) lock=locked_tables; locked_tables=0; close_thread_tables(this); } - mysql_ha_flush(this, (TABLE_LIST*) 0, - MYSQL_HA_CLOSE_FINAL | MYSQL_HA_FLUSH_ALL, FALSE); - hash_free(&handler_tables_hash); + mysql_ha_cleanup(this); delete_dynamic(&user_var_events); hash_free(&user_vars); close_temporary_tables(this); |