From: Bjorn Munch
Date: March 16 2012 9:16am
Subject: bzr push into mysql-trunk branch (bjorn.munch:3789 to 3790)
List-Archive: http://lists.mysql.com/commits/143226
Message-Id: <201203160916.q2G9GJxp031262@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3790 Bjorn Munch	2012-03-16 [merge]
      upmerge 13619394 revert fix

    modified:
      unittest/mysys/my_vsnprintf-t.c
 3789 Jon Olav Hauglid	2012-03-16
      Bug#13833438 ERROR CODES MUST HAVE SAME VALUE ACROSS MYSQL VERSIONS
      
      Follow-up patch.
      
      Fix test failures when the following tests are run in MTS mode:
      - rpl.rpl_stm_EE_err2
      - rpl.rpl_loaddata
      - rpl.rpl_stm_loaddata_concurrent

    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
=== modified file 'unittest/mysys/my_vsnprintf-t.c'
--- a/unittest/mysys/my_vsnprintf-t.c	2012-03-15 07:08:06 +0000
+++ b/unittest/mysys/my_vsnprintf-t.c	2012-03-16 09:14:17 +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).