bzr push into mysql-5.5 branch (mikael.ronstrom:3139 to 3141)

[Mikael Ronstrom]

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

    modified:
      include/my_compiler.h
 3140 Mikael Ronstrom	2011-05-04
      Make MY_ALIGNED usable to define alignment of data structures

    modified:
      include/my_compiler.h
 3139 Mikael Ronstrom	2011-04-20
      Fixed error in merge

    modified:
      sql/sql_prepare.cc
=== 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 */
 
+# ifndef 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 */

No bundle (reason: useless for push emails).