Commit 1c847f79 authored by unknown's avatar unknown
Browse files

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

parent e8d9dccb

sql/sql_parse.cc

+4 −9
Original line number Diff line number Diff line
@@ -1975,16 +1975,11 @@ mysql_execute_command(THD *thd) 
    /*

      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.



      Exceptions are:



      - 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).

      Exception is 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 &&

        !(lex->sql_command == SQLCOM_DROP_TABLE &&

    if (!(lex->sql_command == SQLCOM_DROP_TABLE &&

          lex->drop_temporary && lex->drop_if_exists) &&

        all_tables_not_ok(thd,tables))

    {