bzr push into mysql-trunk branch (tor.didriksen:3922 to 3923) Bug#14255135

[Tor Didriksen]

 3923 Tor Didriksen	2012-06-29
      Bug#14255135 WARN IF VARIABLE LENGTH ARRAY IS USED IN THE CODE

    modified:
      cmake/maintainer.cmake
 3922 Nirbhay Choubey	2012-06-29 [merge]
      Merge of fix for Bug#14136937 from mysql-5.6.

    modified:
      sql/mysqld.cc
      sql/mysqld.h
      sql/sys_vars.cc
=== modified file 'cmake/maintainer.cmake'
--- a/cmake/maintainer.cmake	2012-03-19 01:24:49 +0000
+++ b/cmake/maintainer.cmake	2012-06-29 07:48:53 +0000
@@ -20,6 +20,11 @@ MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS
   SET(MY_MAINTAINER_WARNINGS
       "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing  -Werror")
 
+  CHECK_C_COMPILER_FLAG("-Wvla" HAVE_WVLA)
+  IF(HAVE_WVLA)
+    SET(MY_MAINTAINER_WARNINGS "${MY_MAINTAINER_WARNINGS} -Wvla")
+  ENDIF()
+
   CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
                         HAVE_DECLARATION_AFTER_STATEMENT)
   IF(HAVE_DECLARATION_AFTER_STATEMENT)

No bundle (reason: useless for push emails).