database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-02-15 10:22:03 +02:00
parent b782971c58 dc09f8f29c
commit b006d2ead4
583 changed files with 17039 additions and 5592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_admin.cc
View File

@@ -703,8 +703,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. */
@@ -1042,7 +1041,7 @@ send_result_message:
if (!thd->open_temporary_tables(table) &&
(table->table= open_ltable(thd, table, lock_type, 0)))
{
uint save_flags;
ulonglong save_flags;
/* Store the original value of alter_info->flags */
save_flags= alter_info->flags;