bzr push into mysql-5.5 branch (bjorn.munch:3759 to 3760) Bug#13619394

[Bjorn Munch]

 3760 Bjorn Munch	2012-03-16
      BUG #13619394: fixing incorrect revert
        Doing this for Sayantan whose VPN is not working ATM

    modified:
      unittest/mysys/my_vsnprintf-t.c
 3759 Annamalai Gurusami	2012-03-16 [merge]
      Merging from mysql-5.1 to mysql-5.5. 

    modified:
      mysql-test/suite/innodb/t/innodb_bug11766634.test
=== modified file 'unittest/mysys/my_vsnprintf-t.c'
--- a/unittest/mysys/my_vsnprintf-t.c	2012-03-15 07:05:09 +0000
+++ b/unittest/mysys/my_vsnprintf-t.c	2012-03-16 09:09:10 +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).