mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 13:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'github/10.1' into 10.2

Browse source
This commit is contained in:
Sergei Golubchik 2018-02-06 14:50:50 +01:00
commit 4771ae4b22
466 changed files with 9384 additions and 3636 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql/sql_admin.cc
View file

@ -698,8 +698,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
if (lock_type == TL_WRITE && !table->table->s->tmp_table &&
table->mdl_request.type > MDL_SHARED_WRITE)
{
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. */