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 branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2021-07-21 20:11:07 +02:00
parent cf6d83e7d6 4c387945f0
commit 6190a02f35
80 changed files with 2389 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_insert.cc
View File

@ -4525,8 +4525,17 @@ select_create::prepare(List<Item> &_values, SELECT_LEX_UNIT *u)
DEBUG_SYNC(thd,"create_table_select_before_check_if_exists");
if (!(table= create_table_from_items(thd, &values, &extra_lock, hook_ptr)))
{
if (create_info->or_replace())
{
/* Original table was deleted. We have to log it */
log_drop_table(thd, &create_table->db, &create_table->table_name,
thd->lex->tmp_table());
}
/* abort() deletes table */
DBUG_RETURN(-1);
}
if (create_info->tmp_table())
{