Merge of mysql-5.1-bugteam into mysql-5.5-merge.

CMakeLists.txt

@@ -112,7 +112,8 @@ OPTION(MYSQL_MAINTAINER_MODE "MySQL maintainer-specific development environment"
 # Whether the maintainer mode should be enabled.
 IF(MYSQL_MAINTAINER_MODE)
   IF(CMAKE_COMPILER_IS_GNUCC)
-    SET(MY_MAINTAINER_C_WARNINGS "-Wall -Wextra -Wunused -Wwrite-strings -Werror"
+    SET(MY_MAINTAINER_C_WARNINGS
+        "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror"
         CACHE STRING "C warning options used in maintainer builds.")
   ENDIF()
   IF(CMAKE_COMPILER_IS_GNUCXX)

config/ac-macros/maintainer.m4

@@ -16,7 +16,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [
 AC_DEFUN([MY_MAINTAINER_MODE_WARNINGS], [
   # Setup GCC warning options.
   AS_IF([test "$GCC" = "yes"], [
-    C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Werror"
+    C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror"
     CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter"
   ])