From: sayantan.dutta
Date: March 14 2012 10:21am
Subject: bzr push into mysql-trunk branch (sayantan.dutta:3764 to 3765) Bug#13619394
List-Archive: http://lists.mysql.com/commits/143190
X-Bug: 13619394
Message-Id: <201203141021.q2EALKew028025@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3765 sayantan.dutta@stripped	2012-03-14 [merge]
      BUG #13619394 - 62572: "MAKE TEST" FAILS ON "MY_VSNPRINTF"

    modified:
      unittest/mysys/my_vsnprintf-t.c
 3764 Alfranio Correia	2012-03-14
      BUG#13504281 - FOLLOW UP 'LIVE UPGRADE FAILS BETWEEN 5.5 -> 5.6.4 (BUG#13427444)
      
      Replication objects are always created so repositories are checked in the
      initialization routine even when --server-id is equal to "0" (i.e. default
      value), although a valid --server-id (i.e. not equal to the default value)
      is a requirement to use either a master or slave.
      
      This may cause confusion in live upgrades when an user tries to migrate
      from 5.5 to 5.6 because the operation stops with an error and asking users
      to provide --skip-slave-start in order to avoid the problem.
      
      To avoid this scenario, we only create the replication objects when a valid
      --server-id is provided.

    added:
      mysql-test/r/disabled_replication.result
      mysql-test/t/disabled_replication-master.opt
      mysql-test/t/disabled_replication.test
    modified:
      mysql-test/include/check-testcase.test
      mysql-test/suite/rpl/t/rpl_binlog_errors.test
      sql/item_func.cc
      sql/mysqld.cc
      sql/rpl_master.cc
      sql/rpl_master.h
      sql/rpl_rli.cc
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/share/errmsg-utf8.txt
      sql/sql_insert.cc
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_reload.cc
      sql/sys_vars.cc
=== modified file 'unittest/mysys/my_vsnprintf-t.c'
--- a/unittest/mysys/my_vsnprintf-t.c	2011-06-30 15:46:53 +0000
+++ b/unittest/mysys/my_vsnprintf-t.c	2012-02-02 07:24:45 +0000
@@ -155,7 +155,7 @@ int main(void)
         "conn %ld to: '%-.64s' user: '%-.32s' host: '%-.64s' (%-.64s)",
                    1L,     NULL,          NULL,          NULL,    NULL);
   test1("Hello string `I am a string`",
-        "Hello string %`s", "I am a string");
+        "Hello string `%s`", "I am a string");
   test1("Hello TEST",
         "Hello %05s", "TEST");
   test1("My `Q` test",

No bundle (reason: useless for push emails).