From: Mikael Ronstrom
Date: May 4 2011 8:45am
Subject: bzr commit into mysql-5.5 branch (mikael.ronstrom:3141)
List-Archive: http://lists.mysql.com/commits/136620
Message-Id: <201105040846.p448ksrD008487@dator6>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7827770299252474970=="

--===============7827770299252474970==
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

 3141 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,7 +140,7 @@ struct my_aligned_storage
 
 #endif /* __cplusplus */
 
-# if defined(MY_ALIGNED)
+# ifndef MY_ALIGNED
 /*
   Make sure MY_ALIGNED can be used also on platforms where we don't
   have a way of aligning data structures.


--===============7827770299252474970==
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\
#   n6r771zq0r4jq0sj
# target_branch: file:///home/mikael/mysql_clones/mysql-5.5-\
#   wl5136_community/
# testament_sha1: 6a2834fae8eb1f183725d00c869e94ecc3f9aecc
# timestamp: 2011-05-04 10:45:54 +0200
# base_revision_id: mikael.ronstrom@stripped\
#   2a9aha6inrv469xu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf6bfAwAAW3fgAAQWGP/93an
ECC////wUANa2no26hbxnhKJJgjBMpp6Yo/U1GaZT1MmmJo0aAkpNNBggITyp6IYRgAAIwYoNTKe
qeptTI8oGQNNPUD0jIZDQNqSYp6k8jKPTUMI09EGIaGmJkZBJJBNomaptJg1PU9TyQMgZAyNBS3n
WvAY45XGyvJiAEWZ7wrX13zSQ16jtg1zknJw2cOHNWUM5/tXKaP6YnJSCyWbpS5ZNeMUSpt3UhKR
BwI6YmuWd4rdvNjTQ9I2qCRdCx2Njha0UMOJCY8RTJoI4BnYLqIMDEXQaG4A6KF6LqEu6GF7AjIK
dkmENpkNkYVFvHR6n6XQXLsPeUzp/HFkPrynoYjyYr9NjdwKI1Kr+Z64VBWF5J8xpP3qkWE2QGZQ
otLh0biMx6hDhZ7MAhGMSZHRijMRyCaggQBpWa0hI331TFhjWI3Cu3rffaLgupCeeD32b2f9hlGu
vUsqCEFVo4hQRzD9ixKhcNbVrHRhwCzlbXdcmvLDZpa0LBELMkOfg7dCJEtyUdjzML7QY64nQyiT
sWOreQ8xeUyiKgGqWkY9HLO7iehmw0gH8EcSKGwu3DgcTgQLjiO+jkWeiy48zBv3xJglLTvNMYWh
/TbtiIYRcASJ50PIJ6MZ53vfbIgy0oXDeX7vSkrWmJuMhcEtmyW4pGKSk/c+ipmSHbkh+0Jcfizy
F3P5exDKZBTPMkKK64mdsrrHNA788dj9Q1QTKnPbbTLrVj7wX0d1tldci4TWrPpBLJuK5urDRefC
Kn93pFVVQ1sGUUHUZmbLQLuNaznTRvhcyCvWkh2uugyWOGBvjQd16s5imwrB8IY00klRLu9UV1pP
q9mohSmpHx6DEHZGh2snydwbApri5mRqGwFpLQWrQGuy5kl2PCiIIpsJ0hyJyy+UaEkZy1mWYQG0
agnW8kxKAcX4TlJNOodIKGboeLIz2hVroelBIsQ5hiqWV0/g6sEwJhRS083iOYKSV0k4nsx0Vsxl
T1BjJKuOilHujy7bL9KmmRrR5opAtgK9etrV3PIuTiNIJ/VGMLUnHipqKolN7E/SDVimW3X0PJgq
BVuriGbAdU6eU7ZK73kkwPTxnIUjlza2hHRiC+99VGIKFALM2l9LdZKuo8wenKMKzsKduQ+kUz7F
3JFOFCQ/pt8DAA==


--===============7827770299252474970==--