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.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-05-29 17:34:49 +03:00
parent c98e6d4b3d 6f96ff7268
commit a3539bbb2a
76 changed files with 1593 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_rename.cc
View File

@ -223,7 +223,7 @@ do_rename_temporary(THD *thd, TABLE_LIST *ren_table, TABLE_LIST *new_table,
new_alias= (lower_case_table_names == 2) ? &new_table->alias :
&new_table->table_name;
if (is_temporary_table(new_table))
if (thd->find_temporary_table(new_table, THD::TMP_TABLE_ANY))
{
my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias->str);
DBUG_RETURN(1); // This can't be skipped