1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00

BUG#12542: Prevous patch was incorrect. This removed the patch.

This commit is contained in:
lars@mysql.com
2005-08-15 17:53:38 +02:00
parent 8d7a364074
commit b6a65715d6

View File

@@ -1975,16 +1975,11 @@ mysql_execute_command(THD *thd)
/* /*
Skip if we are in the slave thread, some table rules have been Skip if we are in the slave thread, some table rules have been
given and the table list says the query should not be replicated. given and the table list says the query should not be replicated.
Exception is DROP TEMPORARY TABLE IF EXISTS: we always execute it
Exceptions are: (otherwise we have stale files on slave caused by exclusion of one tmp
table).
- SET: we always execute it (e.g., SET ONE_SHOT TIME_ZONE = 'XYZ')
- DROP TEMPORARY TABLE IF EXISTS: we always execute it (otherwise we
have stale files on slave caused by exclusion of one tmp table).
*/ */
if (lex->sql_command != SQLCOM_SET_OPTION && if (!(lex->sql_command == SQLCOM_DROP_TABLE &&
!(lex->sql_command == SQLCOM_DROP_TABLE &&
lex->drop_temporary && lex->drop_if_exists) && lex->drop_temporary && lex->drop_if_exists) &&
all_tables_not_ok(thd,tables)) all_tables_not_ok(thd,tables))
{ {