From: Date: November 20 2008 4:31pm
Subject: bzr push into mysql-6.0-runtime branch (alik:2757 to 2758)
List-Archive: http://lists.mysql.com/commits/59404
Message-Id: <20081120153108.3C4AB1D48F3@quad.opbmk>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2758 Alexander Nozdrin	2008-11-20
      Remove -Werror.
modified:
  sql/Makefile.am

 2757 Alexander Nozdrin	2008-11-20
      Fix warning.
modified:
  sql/si_objects.cc

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2008-11-19 16:32:01 +0000
+++ b/sql/Makefile.am	2008-11-20 15:29:58 +0000
@@ -57,7 +57,6 @@ SUPPORTING_LIBS =	$(top_builddir)/vio/li
 			$(top_builddir)/strings/libmystrings.a
 mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(SUPPORTING_LIBS) backup/libbackup.la libndb.la
 LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
-mysqld_CXXFLAGS = -Werror
 mysqld_LDADD =		libndb.la \
 			@MYSQLD_EXTRA_LDFLAGS@ \
 			@pstack_libs@ $(libevent_libs) \