diff options
| author | unknown <ingo@mysql.com> | 2005-11-16 10:23:42 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-11-16 10:23:42 +0100 |
| commit | 6506fb3219d05991e745b6c8f28594aaea4aad18 (patch) | |
| tree | abec561c32aa740ef8db20cd3d1be05ef97c42b8 /sql/sql_handler.cc | |
| parent | d49bd3b66778efd6ac5c983b58a9ddf306e3a48a (diff) | |
| parent | faaf53d9668dcfa7b2732a0c8dccd83827a061b9 (diff) | |
| download | mariadb-git-6506fb3219d05991e745b6c8f28594aaea4aad18.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
mysql-test/r/handler.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/mysql_priv.h:
Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Manual merge.
sql/sql_base.cc:
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_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 07f4de26707..da72d283259 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -737,8 +737,8 @@ static int mysql_ha_flush_table(THD *thd, TABLE **table_ptr, uint mode_flags) table->alias, mode_flags)); if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash, - (byte*) table->alias, - strlen(table->alias) + 1))) + (byte*) table->alias, + strlen(table->alias) + 1))) { if (! (mode_flags & MYSQL_HA_REOPEN_ON_USAGE)) { @@ -752,6 +752,7 @@ static int mysql_ha_flush_table(THD *thd, TABLE **table_ptr, uint mode_flags) } } + safe_mutex_assert_owner(&LOCK_open); (*table_ptr)->file->ha_index_or_rnd_end(); safe_mutex_assert_owner(&LOCK_open); if (close_thread_table(thd, table_ptr)) |