diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-13 14:28:07 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-13 14:28:07 +0200 |
| commit | 2de8db6296fb5d5ea90f646b465b6afe33c32286 (patch) | |
| tree | f0a149395b2ddc9a6c8d62ac0a0425dd692597a0 /sql/sql_table.cc | |
| parent | 8a01a0acb332c36c8e1c63027fb9e65587ed2784 (diff) | |
| parent | 60d094aeacb0c1433f2510e0228b2791745ae53e (diff) | |
| download | mariadb-git-2de8db6296fb5d5ea90f646b465b6afe33c32286.tar.gz | |
Merge MDEV-7936 into 10.1
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index c5748459d6d..1f967934e44 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4656,7 +4656,9 @@ int create_table_impl(THD *thd, if (create_info->tmp_table()) { TABLE *tmp_table; - if ((tmp_table= find_temporary_table(thd, db, table_name))) + if (find_and_use_temporary_table(thd, db, table_name, &tmp_table)) + goto err; + if (tmp_table) { bool table_creation_was_logged= tmp_table->s->table_creation_was_logged; if (options.or_replace()) |