database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-06-20 09:22:10 +03:00
parent 16ac8404ac cfbd714868
commit 49e5323dbd
78 changed files with 4098 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_table.cc
View File

@ -10098,6 +10098,8 @@ do_continue:;
DEBUG_SYNC(thd, "alter_table_copy_after_lock_upgrade");
}
else
thd->close_unused_temporary_table_instances(table_list);
// It's now safe to take the table level lock.
if (lock_tables(thd, table_list, alter_ctx.tables_opened,