bk commit into 4.1 tree (lars:1.2378) BUG#12542

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
4.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2378 05/08/15 17:53:38 lars@stripped +1 -0
  BUG#12542: Prevous patch was incorrect. This removed the patch.

  sql/sql_parse.cc
    1.460 05/08/15 17:36:16 lthalmann@stripped +4 -9
    BUG#12542: Prevous patch was incorrect. This removed the patch.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/ltx/dev/mysql-4.1

--- 1.459/sql/sql_parse.cc	2005-08-13 05:04:31 +02:00
+++ 1.460/sql/sql_parse.cc	2005-08-15 17:36:16 +02:00
@@ -1975,16 +1975,11 @@
     /*
       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))
     {