database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge tag 'mariadb-10.0.21' into 10.0-galera

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-08-08 14:21:22 -04:00
parent 4c69dc8116 0403790722
commit 91acc8b16f
348 changed files with 8241 additions and 6388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@@ -4684,12 +4684,12 @@ int create_table_impl(THD *thd,
bool table_creation_was_logged= tmp_table->s->table_creation_was_logged;
if (create_info->options & HA_LEX_CREATE_REPLACE)
{
bool is_trans;
bool tmp;
/*
We are using CREATE OR REPLACE on an existing temporary table
Remove the old table so that we can re-create it.
*/
if (drop_temporary_table(thd, tmp_table, &is_trans))
if (drop_temporary_table(thd, tmp_table, &tmp))
goto err;
}
else if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)