Manual merge from mysql-trunk-bugfixing.

Conflicts:
  - BUILD/SETUP.sh
  - mysql-test/mysql-test-run.pl
  - mysql-test/r/partition_error.result
  - mysql-test/t/disabled.def
  - mysql-test/t/partition_error.test
  - sql/share/errmsg-utf8.txt

1 files changed, 16 insertions, 0 deletions

diff --git a/include/my_global.h b/include/my_global.h
index 6246bde0cbc..7b9c34cd724 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -77,6 +77,11 @@
 #define C_MODE_END
 #endif
 
+#ifdef __cplusplus
+#define CPP_UNNAMED_NS_START  namespace {
+#define CPP_UNNAMED_NS_END    }
+#endif
+
 #if defined(_WIN32) 
 #include <my_config.h>
 #elif defined(__NETWARE__)
@@ -1074,6 +1079,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