Backport into build-201102032246-5.1.52sp1

> ------------------------------------------------------------
> revno: 3452.13.4 [merge]
> revision-id: mmakela@bk-internal.mysql.com-20101011192851-u3bdt7erjkrgn90t
> parent: marko.makela@oracle.com-20101011081800-sby6kmb8n1mnryfq
> parent: jimmy.yang@oracle.com-20101011123613-guz1qgdktywmel1g
> committer: Marko Makela <mmakela@bk-internal.mysql.com>
> branch nick: mysql-5.1-security
> timestamp: Mon 2010-10-11 21:28:51 +0200
> message:
>   Merge Bug #57345, Bug #56982, Bug#53307 test from mysql-5.1-innodb
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.

mysql-test/t/disabled.def

@@ -11,6 +11,5 @@
 ##############################################################################
 kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
-partition_innodb_plugin  : Bug#53307 2010-04-30 VasilDimov valgrind warnings
 main.mysqlhotcopy_myisam : bug#54129 2010-06-04 Horst
 main.mysqlhotcopy_archive: bug#54129 2010-06-04 Horst

storage/innodb_plugin/handler/ha_innodb.cc

@@ -9409,7 +9409,11 @@ ha_innobase::innobase_peek_autoinc(void)
 
 	auto_inc = dict_table_autoinc_read(innodb_table);
 
-	ut_a(auto_inc > 0);
+	if (auto_inc == 0) {
+		ut_print_timestamp(stderr);
+		fprintf(stderr, "  InnoDB: AUTOINC next value generation "
+			"is disabled for '%s'\n", innodb_table->name);
+	}
 
 	dict_table_autoinc_unlock(innodb_table);