bzr push into mysql-5.5-trunk branch (Alexey.Kopytov:2938 to 2939) Bug#49267

[Alexey Kopytov]

 2939 Alexey Kopytov	2009-12-04
      Disable the test case innodb-autonic.test until BUG#49267 is fixed
      
      Add the test to disabled list and remove from the experimental list.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/t/disabled.def
 2938 Gleb Shchepa	2009-12-04 [merge]
      manual merge mysql-5.1-bugteam --> mysql-trunk-merge

    modified:
      sql/sql_class.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/trx0trx.h
      storage/innobase/lock/lock0lock.c
      storage/innobase/trx/trx0i_s.c
      storage/innobase/trx/trx0trx.c
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2009-12-03 20:46:06 +0000
+++ b/mysql-test/collections/default.experimental	2009-12-04 10:54:43 +0000
@@ -8,7 +8,6 @@ funcs_1.charset_collation_1             
 
 main.ctype_gbk_binlog  @solaris          # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
 main.information_schema                  # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
-main.innodb-autoinc*                     # Bug#47809 2009-10-04 joro innodb-autoinc.test fails with valgrind errors with the innodb plugin
 main.lock_multi_bug38499                 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
 main.lock_multi_bug38691 @solaris        # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10
 main.log_tables                          # Bug#47924 2009-10-08 alik main.log_tables times out sporadically 

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-12-03 12:03:24 +0000
+++ b/mysql-test/t/disabled.def	2009-12-04 10:54:43 +0000
@@ -12,4 +12,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
 rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2
+innodb-autoinc           : Bug#49267 2009-12-02 test fails on windows because of different case mode
 innodb                   : Bug#49396 2009-12-03 test fails in embedded mode


Attachment: [text/bzr-bundle] bzr/[e-mail]