bk commit into 4.1 tree (lars:1.2397) 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.2397 05/09/01 17:58:00 lars@stripped +2 -0
  BUG#12542: Added comments

  sql/sql_parse.cc
    1.463 05/09/01 17:56:02 lars@stripped +2 -1
    Added comments

  sql/log_event.cc
    1.185 05/09/01 17:55:46 lars@stripped +20 -0
    Added comments

# 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/bk/mysql-4.1-bug12542

--- 1.184/sql/log_event.cc	2005-08-19 20:49:29 +02:00
+++ 1.185/sql/log_event.cc	2005-09-01 17:55:46 +02:00
@@ -1008,6 +1008,16 @@
 #endif
   clear_all_errors(thd, rli);
 
+  /*
+    Note:   We do not need to execute reset_one_shot_variables() if this
+            db_ok() test fails.
+    Reason: The db stored in binlog events is the same for SET and for
+            its companion query.  If the SET is ignored because of
+            db_ok(), the companion query will also be ignored, and if
+            the companion query is ignored in the db_ok() test of
+            ::exec_event(), then the companion SET also have so we
+            don't need to reset_one_shot_variables().
+  */
   if (db_ok(thd->db, replicate_do_db, replicate_ignore_db))
   {
     thd->set_time((time_t)when);
@@ -1762,6 +1772,16 @@
     Create_file_log_event::exec_event() and then discarding Append_block and
     al. Another way is do the filtering in the I/O thread (more efficient: no
     disk writes at all).
+
+
+    Note:   We do not need to execute reset_one_shot_variables() if this
+            db_ok() test fails.
+    Reason: The db stored in binlog events is the same for SET and for
+            its companion query.  If the SET is ignored because of
+            db_ok(), the companion query will also be ignored, and if
+            the companion query is ignored in the db_ok() test of
+            ::exec_event(), then the companion SET also have so we
+            don't need to reset_one_shot_variables().
   */
   if (db_ok(thd->db, replicate_do_db, replicate_ignore_db))
   {

--- 1.462/sql/sql_parse.cc	2005-08-31 18:05:33 +02:00
+++ 1.463/sql/sql_parse.cc	2005-09-01 17:56:02 +02:00
@@ -1998,7 +1998,8 @@
 
       Exceptions are:
       - SET: we always execute it (Not that many SET commands exists in
-        the binary log anyway)
+        the binary log anyway -- only 4.1 masters write SET statements,
+	in 5.0 there are no SET statements in the binary log)
       - DROP TEMPORARY TABLE IF EXISTS: we always execute it (otherwise we
         have stale files on slave caused by exclusion of one tmp table).
     */