diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-01-23 11:24:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-01-25 14:03:24 +0100 |
| commit | a0702dbcda0c4495345d6dda6738cc77d823e325 (patch) | |
| tree | 506d955acc8922c3d62d1ca5d2bca26ef1453e1a /sql/sql_admin.cc | |
| parent | 1c10b256b301124aa861239bec7e7b97a3d98d98 (diff) | |
| download | mariadb-git-a0702dbcda0c4495345d6dda6738cc77d823e325.tar.gz | |
MDEV-11539 test_if_reopen: Assertion `strcmp(share->unique_file_name,filename) || share->last_version' failed upon select from I_S
remove HA_EXTRA_PREPARE_FOR_RENAME - neither OPTIMIZE nor REPAIR need it
(was introduced in b58e79566c5 when replacing remove_table_from_cache()
with wait_while_table_is_used() even though remove_table_from_cache()
did not have it).
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index a3e13fe0e5a..3aac41d6e41 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -638,8 +638,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, */ if (lock_type == TL_WRITE && !table->table->s->tmp_table) { - if (wait_while_table_is_used(thd, table->table, - HA_EXTRA_PREPARE_FOR_RENAME)) + if (wait_while_table_is_used(thd, table->table, HA_EXTRA_NOT_USED)) goto err; DEBUG_SYNC(thd, "after_admin_flush"); /* Flush entries in the query cache involving this table. */ |