diff options
| author | Monty <monty@mariadb.org> | 2015-05-11 23:11:05 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-05 17:14:13 +0200 |
| commit | b2b07b33cf55b39db87a00789936113cc290f678 (patch) | |
| tree | cf2e88b1d0c8326f8a36e41e86dcff27536f3aeb /sql/sql_table.cc | |
| parent | d2f6166ec5bc6c36f61f83b673b5b5dcd05edf12 (diff) | |
| download | mariadb-git-b2b07b33cf55b39db87a00789936113cc290f678.tar.gz | |
Don't write DROP TEMPORARY TABLE to binary log
if we didn't write the CREATE TEMPORARY TABLE statement.
- Enable old code from one of my older changesets that didn't make into 10.0
- Fix test cased that failed as they expected DROP TEMPORARY TABLE in the log.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index b05bdc901d1..5091bfbd427 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2314,9 +2314,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists, . "DROP" was executed but a temporary table was affected (.i.e !error). */ -#ifndef DONT_LOG_DROP_OF_TEMPORARY_TABLES - table_creation_was_logged= 1; -#endif if (!dont_log_query && table_creation_was_logged) { /* @@ -4698,9 +4695,6 @@ int create_table_impl(THD *thd, We have to log this query, even if it failed later to ensure the drop is done. */ -#ifndef DONT_LOG_DROP_OF_TEMPORARY_TABLES - table_creation_was_logged= 1; -#endif if (table_creation_was_logged) { thd->variables.option_bits|= OPTION_KEEP_LOG; |