summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2009-11-02 19:06:58 +0400
committerSergey Vojtovich <svoj@sun.com>2009-11-02 19:06:58 +0400
commit66fc82247d19ec4782b5289d72fc7531289c9174 (patch)
tree75b383820e3c17b2a1bf6d86068c065011c053d7 /storage
parent37d83e4d48a8ec517946893a78d25e30473afd54 (diff)
downloadmariadb-git-66fc82247d19ec4782b5289d72fc7531289c9174.tar.gz
Applying InnoDB snashot 5.1-ss6129
Detailed revision comments: r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines branches/5.1: Backport c6121 from branches/zip: ------------------------------------------------------------------------ r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines Changed paths: M /branches/zip/mysql-test/innodb-autoinc.result branches/zip: This test has been problematic for sometime now. The underlying bug is that the data dictionaries get out of sync. In the AUTOINC code we try and apply salve to the symptoms. In the past MySQL made some unrelated change and the dictionaries stopped getting out of sync and this test started to fail. Now, it seems they have reverted that changed and the test is passing again. I suspect this is not he last time that this test will change. ------------------------------------------------------------------------
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am
index a597e3c24e4..8114da9af03 100644
--- a/storage/innobase/Makefile.am
+++ b/storage/innobase/Makefile.am
@@ -156,8 +156,8 @@ libinnobase_a_SOURCES= btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c \
ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c \
handler/ha_innodb.cc
-libinnobase_a_CXXFLAGS= $(AM_CFLAGS)
-libinnobase_a_CFLAGS= $(AM_CFLAGS)
+libinnobase_a_CXXFLAGS=-Werror $(AM_CFLAGS)
+libinnobase_a_CFLAGS=-Werror $(AM_CFLAGS)
EXTRA_LTLIBRARIES= ha_innodb.la
pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@