From: Bjorn Munch
Date: March 2 2011 9:16am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3177)
List-Archive: http://lists.mysql.com/commits/132268
Message-Id: <201103020916.p229GiOa026922@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0898749046=="

--===============0898749046==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

 3177 Bjorn Munch	2011-03-02
      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);


--===============0898749046==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/mtr-55/
# testament_sha1: 07bdf360f04b32ebea69895b025ba632402559c1
# timestamp: 2011-03-02 10:16:44 +0100
# source_branch: file:///home/bm136801/my/main-55/
# base_revision_id: bjorn.munch@stripped\
#   q39m2f20ne3alx7v
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbFpdj0AAa3fgAQQUvf//1sC
QAC////wUAO7Z3UcuLXebe1cJREFP0TJoYT1GhNqeiGT1BoGTQGk1NNBpgQptR6nk1HqBoMnpBkM
gkkAmiDNRTxpT1HqHpHqYj1AANBJKaaekppp5HqnlGIyZD1AAaNAAkqaTRhPUekaaNT9SYm0EZGI
xMRhxht4x4O+nmLb225M4hi+5BuGi/ez5aROXXvnVfiVu/ihCC+HAbg/gpaA9CZRCKjl+rS0xZoy
vlvHyZ3LORVvI/xvNRpEw0TQV0v6Va9VmCNvYhswDeydYVTdaD96hBTdm+6+ZUPEG6IhMb3bW4Jr
fReaZJE1og4Q611DZYbYEWprSjywgIhkEyvZBvcrtEa1OJqbU6yv0HAPGS/2kO1HCdyn86JF/9G8
IoNRcYGxwyaU6HWt3GuuSL/xe8Ru7FDBOqBNI9tkCvBq85ZdMslFi7iBTFNb05bshtrK6i3VyYKR
MtA7uV5VSFMtJ5ohvuF420dB6v4XnBZSGIOyHCjDBaEtblMazDnTHvoVFTXF4NeXWoYeXZxfUvzL
VcsAk/ew9aOouSlJ1fRh132MVOC1OeDPCAgCO5rJnPLJ1gKCW1PFk0g1ZjKusLvcwt/TrGRRbEqF
9gKISqFU7KJoNrzg2lI6LQZFKEiF3DNczMpbWOon2eb4PC0NUbNHY4IuTSaBQJTb2mQ5HB2TvzMU
2YXBbn8hCXsBTnungYyTFBOoLc5hxBgS15ntsYM21O8O5muvPwRDrlmywBvxpTL0hsjyzINNKXLf
DtrMZHXamw1Cs5OZ2oeKNlJLNUe4TV/PBNMiqCyFgkUjWEgx6+3Xw9a5lrXYL00TtkyK91C4yORn
OdHns198DIE8aIExesm3G4qac7/IeJsoA2YYrnubA1YROrqY+7HVXLFy4Wtp3O450emoDlsfnjBt
Sazjz4EWqu7npvY2M5RAkiwuzoUwqesGI7RyvIHn/Jn41tMqhHFYNswyTB/X3Wrc4YwdVB3sFeIa
PvC3aRGl/2QHoD8YNBrAttljSGHrR81EwpYlIkbVIJllPipwvN04wXiI7U7Otde1Lh4hvixTCLCG
kDeCi826ah4BTemQyZgZc8qMVWoOvqJxuBPrZdlJ+pGsJktRD0xECU/JbTQJf56CqlVSMc1+J9QR
93GJJRLjllyWhJdHQRXpqM4R54hiVEr84xhJmYKUnjpF8n573TUZlJ9gZGOOK1XBfKEKuQoty6Mg
s/6yjORNi5C7mdjCw5jc8HT301H5FUJr0MRZai2nv8piNGNeg+6xTKkN4PDhOa59pSoCNTUMgHA4
fPDfZalUfkXckU4UJCxaXY9A


--===============0898749046==--