bzr commit into mysql-5.1-telco-6.2 branch (magnus.blaudd:3146)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/merge-5.1.54/6.2/ based on revid:magnus.blaudd@strippedl6tydn

 3146 Magnus Blåudd	2011-04-04
      ndb
       - remove the -Werror compiler flag from maintainer mode
         (until storage/ndb can be compiled with it)

    modified:
      config/ac-macros/maintainer.m4
=== modified file 'config/ac-macros/maintainer.m4'
--- a/config/ac-macros/maintainer.m4	2010-11-05 13:17:47 +0000
+++ b/config/ac-macros/maintainer.m4	2011-04-04 07:02:01 +0000
@@ -17,7 +17,11 @@ 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 -Wno-strict-aliasing -Werror"
+    # MCP -->
+    # Remove the -Werror flag until storage/ndb produce no warnings
+    # C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror"
+    C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing"
+    # MCP <--
     CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter"
     C_WARNINGS="${C_WARNINGS} -Wdeclaration-after-statement"
   ])

Attachment: [text/bzr-bundle] bzr/[e-mail]