bk commit into 5.0 tree (bar:1.2293)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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@stripped, 2006-11-01 12:34:42+04:00, bar@stripped +2 -0
  Merge abarkov@stripped:/home/bk/mysql-5.0-rpl
  into  mysql.com:/usr/home/bar/mysql-5.0.b22877
  MERGE: 1.2258.71.5

  BitKeeper/etc/collapsed@stripped, 2006-11-01 12:33:09+04:00, bar@stripped +1 -1
    auto-union
    MERGE: 1.4.2.1

  sql/sql_parse.cc@stripped, 2006-11-01 12:34:20+04:00, bar@stripped +0 -0
    Auto merged
    MERGE: 1.580.1.1

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0.b22877/RESYNC

--- 1.583/sql/sql_parse.cc	2006-11-01 12:34:50 +04:00
+++ 1.584/sql/sql_parse.cc	2006-11-01 12:34:50 +04:00
@@ -2494,7 +2494,23 @@ mysql_execute_command(THD *thd)
     {
       /* we warn the slave SQL thread */
       my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
-      reset_one_shot_variables(thd);
+      if (thd->one_shot_set)
+      {
+        /*
+          It's ok to check thd->one_shot_set here:
+
+          The charsets in a MySQL 5.0 slave can change by both a binlogged
+          SET ONE_SHOT statement and the event-internal charset setting, 
+          and these two ways to change charsets do not seems to work
+          together.
+
+          At least there seems to be problems in the rli cache for
+          charsets if we are using ONE_SHOT.  Note that this is normally no
+          problem because either the >= 5.0 slave reads a 4.1 binlog (with
+          ONE_SHOT) *or* or 5.0 binlog (without ONE_SHOT) but never both."
+        */
+        reset_one_shot_variables(thd);
+      }
       DBUG_RETURN(0);
     }
   }

--- 1.8/BitKeeper/etc/collapsed	2006-11-01 12:34:50 +04:00
+++ 1.9/BitKeeper/etc/collapsed	2006-11-01 12:34:50 +04:00
@@ -8,3 +8,4 @@
 4519a6c5BVUxEHTf5iJnjZkixMBs8g
 451ab499rgdjXyOnUDqHu-wBDoS-OQ
 452c6c6dAjuNghfc1ObZ_UQ5SCl85g
+4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg