From: Bjorn Munch
Date: March 2 2011 9:17am
Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3038)
List-Archive: http://lists.mysql.com/commits/132269
Message-Id: <201103020917.p229Hch9026938@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped

 3038 Bjorn Munch	2011-03-02 [merge]
      Fix non-portable test of %p in unit test my_vsnprintf

    modified:
      unittest/mysys/my_vsnprintf-t.c
=== modified file 'unittest/mysys/my_vsnprintf-t.c'
--- a/unittest/mysys/my_vsnprintf-t.c	2010-09-15 11:33:22 +0000
+++ b/unittest/mysys/my_vsnprintf-t.c	2011-03-02 09:16:34 +0000
@@ -110,8 +110,11 @@ int main(void)
   test1("Positional arguments octal: <7777>",
         "Positional arguments octal: <%1$o>", 07777);
 
+  /* Can't use int arguments, as they may be different size from pointers */
+
   test1("Padding and %p <0x12> <0x034> <0x0000ab> <    0xcd>",
-        "Padding and %%p <%04p> <%05p> <%08p> <%8p>", 0x12, 0x34, 0xab, 0xcd);
+        "Padding and %%p <%04p> <%05p> <%08p> <%8p>",
+        (void*) 0x12, (void*) 0x34, (void*) 0xab, (void*) 0xcd);
 
   test1("F with a width (ignored) and precision: <12.34568>",
         "F with a width (ignored) and precision: <%10.5f>", 12.3456789);

No bundle (reason: revision is a merge).