diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2015-04-15 12:09:25 -0700 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2015-04-15 12:09:25 -0700 |
| commit | c712b376d8189b963851db86a0bedd478aab869e (patch) | |
| tree | 8d02a74357f8ba77261d79bd70ca6174e0fe5dd8 /sql/sql_table.cc | |
| parent | 25da74ce3f17a4720f4f7f06b1d694ff417d6b60 (diff) | |
| parent | d051f6c36beaf6c7ea269d6c174cca7482f3e823 (diff) | |
| download | mariadb-git-bb-10.1-explain-analyze.tar.gz | |
Merge branch '10.1' into bb-10.1-explain-analyzebb-10.1-explain-analyze
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 b9eaee8e007..de2c40be344 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()) |