mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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.
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user