database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Eugene Kosov
2019-07-16 15:42:36 +03:00
parent aa96e56c55 d2f094d9e6
commit 0f83c8878d
155 changed files with 6020 additions and 2233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_table.cc
View File

@ -7554,6 +7554,7 @@ static bool mysql_inplace_alter_table(THD *thd,
if (res)
goto rollback;
DEBUG_SYNC(thd, "alter_table_inplace_before_lock_upgrade");
// Upgrade to EXCLUSIVE before commit.
if (wait_while_table_is_used(thd, table, HA_EXTRA_PREPARE_FOR_RENAME))
goto rollback;