diff --git a/Makefile.am b/Makefile.am
index a597e3c24e4..8114da9af03 100644
--- a/Makefile.am
+++ b/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@
diff --git a/mysql-test/innodb-autoinc.result b/mysql-test/innodb-autoinc.result
index ca71855a5c4..a40a13dbe9f 100644
--- a/mysql-test/innodb-autoinc.result
+++ b/mysql-test/innodb-autoinc.result
@@ -875,12 +875,13 @@ ALTER TABLE t1 CHANGE c1 d1 INT NOT NULL AUTO_INCREMENT;
 SELECT * FROM t1;
 d1
 1
-2
+3
 SELECT * FROM t1;
 d1
 1
-2
+3
 INSERT INTO t1 VALUES(null);
+Got one of the listed errors
 ALTER TABLE t1 AUTO_INCREMENT = 3;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -892,7 +893,6 @@ INSERT INTO t1 VALUES(null);
 SELECT * FROM t1;
 d1
 1
-2
 3
 4
 DROP TABLE t1;
diff --git a/mysql-test/innodb-autoinc.test b/mysql-test/innodb-autoinc.test
index 918449e75c3..3f45bb9d003 100644
--- a/mysql-test/innodb-autoinc.test
+++ b/mysql-test/innodb-autoinc.test
@@ -497,7 +497,7 @@ SELECT * FROM t1;
 # longer results in the two data dictionaries being out of sync. If they
 # revert their changes then this check for ER_AUTOINC_READ_FAILED will need
 # to be enabled.
-#-- error ER_AUTOINC_READ_FAILED,1467
+-- error ER_AUTOINC_READ_FAILED,1467
 INSERT INTO t1 VALUES(null);
 ALTER TABLE t1 AUTO_INCREMENT = 3;
 SHOW CREATE TABLE t1;