Merge mysql-trunk-bugfixing -> mysql-trunk-innodb

(skipping the change to storage/innobase/os/os0file.c because
that issue has already been addressed in mysql-trunk-innodb)

1 files changed, 11 insertions, 0 deletions

diff --git a/include/my_global.h b/include/my_global.h
index 094853cb642..2a65c610604 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1070,6 +1070,17 @@ typedef long long	my_ptrdiff_t;
 #define MY_DIV_UP(A, B) (((A) + (B) - 1) / (B))
 #define MY_ALIGNED_BYTE_ARRAY(N, S, T) T N[MY_DIV_UP(S, sizeof(T))]
 
+#ifdef __cplusplus
+template <size_t sz> struct Aligned_char_array
+{
+  union {
+    void *v;                                    // Ensures alignment.
+    char arr[sz];                               // The actual buffer.
+  } u;
+  void* arr() { return &u.arr[0]; }
+};
+#endif  /* __cplusplus  */
+
 /*
   Custom version of standard offsetof() macro which can be used to get
   offsets of members in class for non-POD types (according to the current