branches/5.1:

Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.

mysql-test/innodb-autoinc.result

@@ -880,7 +880,6 @@ d1
 1
 3
 INSERT INTO t1 VALUES(null);
-Got one of the listed errors
 ALTER TABLE t1 AUTO_INCREMENT = 3;
 INSERT INTO t1 VALUES(null);
 SELECT * FROM t1;
@@ -888,4 +887,5 @@ d1
 1
 3
 4
+5
 DROP TABLE t1;

mysql-test/innodb-autoinc.test

@@ -492,7 +492,11 @@ SELECT * FROM t1;
 # The MySQL and InnoDB data dictionaries should now be out of sync.
 # The select should print message to the error log
 SELECT * FROM t1;
--- error ER_AUTOINC_READ_FAILED,1467
+# MySQL have made a change (http://lists.mysql.com/commits/75268) that no
+# 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
 INSERT INTO t1 VALUES(null);
 ALTER TABLE t1 AUTO_INCREMENT = 3;
 INSERT INTO t1 VALUES(null);