summaryrefslogtreecommitdiff
path: root/sql/sql_rename.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-05-24 11:08:02 +0300
committerMonty <monty@mariadb.org>2018-05-24 11:08:02 +0300
commite744c687ca2c2523b63d5ac0066276a6cb3e932f (patch)
tree7d3fbd9457d9a6f074d4c8dbb925fcb65730e135 /sql/sql_rename.cc
parent5797cbaf4ab93cdae191486c6c82be79b83c56d2 (diff)
parenta816aa066e5c879a92819d694a93d245e6ec6e47 (diff)
downloadmariadb-git-e744c687ca2c2523b63d5ac0066276a6cb3e932f.tar.gz
Merge remote-tracking branch 'origin/10.0' into 10.1
Diffstat (limited to 'sql/sql_rename.cc')
-rw-r--r--sql/sql_rename.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
index 35222bce949..4c164a3a621 100644
--- a/sql/sql_rename.cc
+++ b/sql/sql_rename.cc
@@ -222,7 +222,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 (find_temporary_table(thd, new_table))
{
my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias);
DBUG_RETURN(1); // This can't be skipped