From: Date: February 23 2007 3:32pm
Subject: bk commit into 5.0 tree (gbichot:1.2396) BUG#24432
List-Archive: http://lists.mysql.com/commits/20456
X-Bug: 24432
Message-Id: <200702231432.l1NEWxnH026156@dl145h.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of gbichot. When gbichot 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, 2007-02-23 15:32:51+01:00, gbichot@stripped +2 -0
  the fix for BUG#24432
    "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
  didn't make it into 5.0.36 and 5.1.16,
  so we need to adjust the bug-detection-based-on-version-number code.
  Because the rpl tree has a too old version, rpl_insert_id cannot pass,
  so I disable it (like is already the case in 5.1-rpl for the same reason),
  and the repl team will re-enable it when they merge 5.0 and 5.1 into
  their trees (thus getting the right version number).

  mysql-test/t/disabled.def@stripped, 2007-02-23 15:26:32+01:00, gbichot@stripped +1 -0
        rpl_insert_id tests statement-based replication of INSERT ON
        DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is
        fixed in 5.0.38; we made the slave detect if it is connected to a
        <5.0.38 master and if so refuse to replicate.
        The problem is that this 5.0-rpl tree, even though it will produce
        the 5.0.38 release, still has a 5.0.36 version in configure.in.
        Thus rpl_insert_id fails. So I disable it. As soon as the 5.0-rpl
        tree gets the changesets from the main 5.0, its version will change
        to 5.0.38 and so the repl team will re-enable the test.

  sql/slave.cc@stripped, 2007-02-23 15:28:39+01:00, gbichot@stripped +2 -2
    the fix for BUG#24432 didn't make it into 5.0.36 and 5.1.16,
    so we need to adjust the bug-detection-based-on-version-number code.

# 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:	gbichot
# Host:	dl145h.mysql.com
# Root:	/users/gbichot/mysql-5.0-rpl

--- 1.288/sql/slave.cc	2007-02-23 15:32:59 +01:00
+++ 1.289/sql/slave.cc	2007-02-23 15:32:59 +01:00
@@ -5181,8 +5181,8 @@ bool rpl_master_has_bug(RELAY_LOG_INFO *
   };
   static struct st_version_range_for_one_bug versions_for_all_bugs[]=
   {
-    {24432, { 5, 0, 24 }, { 5, 0, 36 } },
-    {24432, { 5, 1, 12 }, { 5, 1, 16 } }
+    {24432, { 5, 0, 24 }, { 5, 0, 38 } },
+    {24432, { 5, 1, 12 }, { 5, 1, 17 } }
   };
   const uchar *master_ver=
     rli->relay_log.description_event_for_exec->server_version_split;

--- 1.39/mysql-test/t/disabled.def	2007-02-23 15:32:59 +01:00
+++ 1.40/mysql-test/t/disabled.def	2007-02-23 15:32:59 +01:00
@@ -14,4 +14,5 @@ im_daemon_life_cycle     : Bug#24415  se
 ndb_load        : Bug#17233
 user_limits     : Bug#23921 random failure of user_limits.test
 flush2          : Bug#24805 Pushbuild can't handle test with --disable-log-bin
+rpl_insert_id   : replication team will enable as soon as they merge their tree with main tree and so got version number 5.0.38