diff options
| author | unknown <ingo@mysql.com> | 2005-11-15 18:09:40 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-11-15 18:09:40 +0100 |
| commit | faaf53d9668dcfa7b2732a0c8dccd83827a061b9 (patch) | |
| tree | da120a595ab6bb6ad5f661ed7c3f1a79dd8cbf63 /sql/sql_class.cc | |
| parent | 675226728c40b2b9c477b7628a867292b243351d (diff) | |
| parent | 15062e97e9f90cea52fd220d2fc5ec76faeb1748 (diff) | |
| download | mariadb-git-faaf53d9668dcfa7b2732a0c8dccd83827a061b9.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-4000
into mysql.com:/home/mydev/mysql-4.1-4100
mysql-test/r/handler.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/t/handler.test:
Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Manual merge.
sql/sql_handler.cc:
Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Manual merge.
sql/sql_table.cc:
Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Manual merge.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 947da6b10d6..ef938a13489 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -353,7 +353,7 @@ void THD::cleanup(void) close_thread_tables(this); } mysql_ha_flush(this, (TABLE_LIST*) 0, - MYSQL_HA_CLOSE_FINAL | MYSQL_HA_FLUSH_ALL); + MYSQL_HA_CLOSE_FINAL | MYSQL_HA_FLUSH_ALL, FALSE); hash_free(&handler_tables_hash); delete_dynamic(&user_var_events); hash_free(&user_vars); |