From: Mikael Ronstrom
Date: May 4 2011 8:42am
Subject: bzr commit into mysql-5.5 branch (mikael.ronstrom:3140)
List-Archive: http://lists.mysql.com/commits/136619
Message-Id: <201105040843.p448hr8m008335@dator6>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2557845452422543178=="

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

#At file:///home/mikael/mysql_clones/mysql-5.5-wl5136_community/ based on revid:mikael.ronstrom@stripped

 3140 Mikael Ronstrom	2011-05-04
      Make MY_ALIGNED usable to define alignment of data structures

    modified:
      include/my_compiler.h
=== modified file 'include/my_compiler.h'
--- a/include/my_compiler.h	revid:mikael.ronstrom@stripped
+++ b/include/my_compiler.h	revid:mikael.ronstrom@stripped
@@ -140,6 +140,14 @@ struct my_aligned_storage
 
 #endif /* __cplusplus */
 
+# if defined(MY_ALIGNED)
+/*
+  Make sure MY_ALIGNED can be used also on platforms where we don't
+  have a way of aligning data structures.
+*/
+#define MY_ALIGNED(size)
+#endif
+
 #include <my_attribute.h>
 
 #endif /* MY_COMPILER_INCLUDED */


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mikael.ronstrom@stripped\
#   2a9aha6inrv469xu
# target_branch: file:///home/mikael/mysql_clones/mysql-5.5-\
#   wl5136_community/
# testament_sha1: 1572e23c1249ef0f467a808d28e6fc2b580dfc3a
# timestamp: 2011-05-04 10:42:53 +0200
# base_revision_id: mikael.ronstrom@stripped\
#   4yslf502qltlu46z
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYiDNTkAAXjfgEAQWPP/93an
ECC////wUAOnbq2PPKF5dmwlEmgEynk0xHqCemqP1PUT2lD1PTT1Q9QyDJAieEjJ4ohpo0ZA0DQA
ACSQIaQnoBqaNPUYmgaAAAAyUDUaNlBppphA0AAAAAJJEaCmxNDRPRG1GQaNA0BiaGk+Wlz69tPc
hso77K6q1jLWa5wPB9mjQMco3VzcqqZ9SlsCkisWd9c/wjs2OXro8/V/csBn7ycZNTao+7ZlPYlY
LOraepYu80dCai0hE5gsQrgSihTBAJQQ6CrQZr1cLjY/cpKapQkCM5UCNl87oWVYQ9MzFKGBBRaj
nXNxUgLK73syGaqQsZrebEEFOgk/dusHsnXRIx6WQWlO19gIWyA2BgyUpaItPeuYaajAN+ZLzHbp
3ph4iJPnMtMpestBPWG8Se03JV0c8jeYKhaKX29EYLJEWB+JtaSxuPOBagWiUNdUgLbHXhZ9guzm
EvyMBifRJhSNEmUvHAtzS0G2hfjDXHDaKuLhWzQKJf+oN/LYJ0be5QMYllGOGfECsGtBocosypCB
WMICtbAcs0eDfa+IFsWC8VmLZJdpx0xwEwWhZOSNihcpL4OuRrFgLUHpoNGSBCRtBT2S39OJzGfV
qewjgEc7Jj4Q7eG0NwbQqXz1ObcDt4cAzeaxUY2DZ6vCaSOILLrehNE3iYQnxovOnIQ5ykJ0RCfC
OEMBGWlRktlmUXvZSgzAnPozX8ZbLSHQW1jKbfC4noMQ3m1xHGZKSHTY55mEO9EinWEUCRYLxEU5
+JDSUV0qRM9YZuXAY6tO+IgjtHpP3634Q9l40NXTBjc1EOo8dvZ4exc+ejIYQkwG+cuA0uWny+Ta
IKF5RpFtRDhNwWr+MPGy0cio7Wk1Gy3V4xcFlFCBGPcBeJnXMmq/Y1x89ZBIf7DByb2HpUr3OZC2
QwxmvrOSeREEYk81z1KUFO405ZIr98qm4+twhjtS9IiWbWEaqozi2XWR4w7QqleV5i0uSLTIHXl6
RhKbhZTeFsKjdWIcihVqzQ6da0Km+JGlSw5Lwy9T2GdnzVFMByqhrnVU1H7XOYrnPRnZQYu5cjX4
CikSE5kyquw5H3jK6xIYQyH6JQ18YAsAicOQJ3KWaUZoh4gwNQs02zs59eekQwyDGA8kgTqexpCg
/VcR1UhRMFtEQ3pSicYtL1j1EpYMWmD2sysXYNIbHTV2hbNTismGNIzjm/rYDNrHGN16RXEzckyC
jSFSmGchQcq7Bo0SK/Ac/m6LZyovEoqqFWGWMnbJmh2ZFQtGI6xuBZJA43XWjcO0tFlOoIiRwH+L
uSKcKEhEQZqcgA==


--===============2557845452422543178==--