List:Commits« Previous MessageNext Message »
From:Anitha Gopi Date:May 24 2011 4:30pm
Subject:bzr push into mysql-5.1 branch (anitha.gopi:3624 to 3628) Bug#12371924
View as plain text  
 3628 Anitha Gopi	2011-05-24
      BUG#12371924 # Bug is fixed. Move test out of experimental group

    modified:
      mysql-test/collections/default.experimental
 3627 Anitha Gopi	2011-05-24
      Changed to Oracle bug numbers

    modified:
      mysql-test/collections/default.experimental
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/federated/disabled.def
      mysql-test/suite/funcs_1/t/disabled.def
      mysql-test/suite/funcs_2/t/disabled.def
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb_team/t/disabled.def
      mysql-test/suite/parts/t/disabled.def
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl_ndb/t/disabled.def
      mysql-test/suite/sys_vars/t/disabled.def
      mysql-test/t/disabled.def
 3626 Anitha Gopi	2011-05-24
      Bug#11756699: Move test from disabled to experimental group

    modified:
      mysql-test/collections/default.experimental
      mysql-test/t/disabled.def
 3625 Anitha Gopi	2011-05-24
      Bug#12584161 - Moved test from disabled to experimental group

    modified:
      mysql-test/collections/default.experimental
      mysql-test/t/disabled.def
 3624 Vasil Dimov	2011-05-22 [merge]
      Merge mysql-5.1-innodb -> mysql-5.1

    modified:
      storage/innobase/dict/dict0load.c
      storage/innodb_plugin/dict/dict0load.c
      storage/innodb_plugin/include/univ.i
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-16 20:04:01 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-24 10:16:14 +0000
@@ -2,7 +2,6 @@
 # in alphabetical order. This also helps with merge conflict resolution.
 
 binlog.binlog_multi_engine               # joro : NDB tests marked as experimental as agreed with bochklin
-binlog.binlog_bug23533			 # skozlov: BUG#12371924
 
 
 funcs_1.charset_collation_1              # depends on compile-time decisions
@@ -14,20 +13,23 @@ funcs_1.ndb*                            
 
 funcs_2.ndb_charset                      # joro : NDB tests marked as experimental as agreed with bochklin
 
-innodb_plugin.*  @solaris                # Bug#56063 InnoDB Plugin mysql-tests fail on Solaris
+innodb_plugin.*  @solaris                # Bug#11763366 InnoDB Plugin mysql-tests fail on Solaris
+
+main.ctype_gbk_binlog  @solaris          # Bug#11754407: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
+main.func_str  @solaris                  # joro: Bug#11750406
+main.sp @solaris                         # joro : Bug#11761625
+main.query_cache_28249                   # Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically
+main.log_tables-big                      # Bug#11756699 2010-11-15 mattiasj report already exists
 
-main.ctype_gbk_binlog  @solaris          # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
-main.func_str  @solaris                  # joro: Bug#40928
-main.sp @solaris                         # joro : Bug#54138
 
 ndb.*                                    # joro : NDB tests marked as experimental as agreed with bochklin
 
-rpl.rpl_innodb_bug28430   @solaris       # Bug#46029
-rpl.rpl_row_sp011         @solaris       # Joro : Bug #45445
+rpl.rpl_innodb_bug28430   @solaris       # Bug#11754425
+rpl.rpl_row_sp011         @solaris       # Joro : Bug #11753919
 rpl.rpl_stop_slave                       # Sven : BUG#12345981
 
 rpl_ndb.*                                # joro : NDB tests marked as experimental as agreed with bochklin
-rpl_ndb.rpl_ndb_log                      # Bug#38998
+rpl_ndb.rpl_ndb_log                      # Bug#11749433
 
 stress.ddl_ndb                           # joro : NDB tests marked as experimental as agreed with bochklin
 
@@ -45,6 +47,6 @@ parts.partition_mgm_lc1_ndb             
 parts.partition_mgm_lc2_ndb              # joro : NDB tests marked as experimental as agreed with bochklin
 parts.partition_syntax_ndb               # joro : NDB tests marked as experimental as agreed with bochklin
 parts.partition_value_ndb                # joro : NDB tests marked as experimental as agreed with bochklin
-main.gis-rtree                           # svoj: due to BUG#38965
-main.type_float                          # svoj: due to BUG#38965
-main.type_newdecimal                     # svoj: due to BUG#38965
+main.gis-rtree                           # svoj: due to BUG#11749418
+main.type_float                          # svoj: due to BUG#11749418
+main.type_newdecimal                     # svoj: due to BUG#11749418

=== modified file 'mysql-test/suite/binlog/t/disabled.def'
--- a/mysql-test/suite/binlog/t/disabled.def	2010-11-23 13:35:40 +0000
+++ b/mysql-test/suite/binlog/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -9,5 +9,5 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-binlog_truncate_innodb	: BUG#57291 2010-10-20 anitha Originally disabled due to BUG#42643. Product bug fixed, but test changes needed
-binlog_row_failure_mixing_engines : BUG#58416 2010-11-23 ramil Fails on win x86 debug_max
+binlog_truncate_innodb	: BUG#11764459 2010-10-20 anitha Originally disabled due to BUG#42643. Product bug fixed, but test changes needed
+binlog_row_failure_mixing_engines : BUG#11765446 2010-11-23 ramil Fails on win x86 debug_max

=== modified file 'mysql-test/suite/federated/disabled.def'
--- a/mysql-test/suite/federated/disabled.def	2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/federated/disabled.def	2011-05-24 06:38:13 +0000
@@ -9,4 +9,4 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-federated_transactions : Bug#29523 Transactions do not work
+federated_transactions : Bug#11746899 Transactions do not work

=== modified file 'mysql-test/suite/funcs_1/t/disabled.def'
--- a/mysql-test/suite/funcs_1/t/disabled.def	2009-06-19 15:44:29 +0000
+++ b/mysql-test/suite/funcs_1/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -10,4 +10,4 @@
 #
 ##############################################################################
 
-ndb_trig_1011ext:  Bug#32656 NDB: Duplicate key error aborts transaction in handler. Doesn't talk back to SQL
+ndb_trig_1011ext:  Bug#11747493 NDB: Duplicate key error aborts transaction in handler. Doesn't talk back to SQL

=== modified file 'mysql-test/suite/funcs_2/t/disabled.def'
--- a/mysql-test/suite/funcs_2/t/disabled.def	2008-12-08 14:36:42 +0000
+++ b/mysql-test/suite/funcs_2/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -1,6 +1,6 @@
 # Disabled by hhunger (2008-03-03) due to WL4204
-innodb_charset : Bug#20447 Problem with prefix keys with contractions and expansions
-myisam_charset : Bug#20447 Problem with prefix keys with contractions and expansions
-memory_charset : Bug#20447 Problem with prefix keys with contractions and expansions
-ndb_charset    : Bug#20447 Problem with prefix keys with contractions and expansions
+innodb_charset : Bug#11745840 Problem with prefix keys with contractions and expansions
+myisam_charset : Bug#11745840 Problem with prefix keys with contractions and expansions
+memory_charset : Bug#11745840 Problem with prefix keys with contractions and expansions
+ndb_charset    : Bug#11745840 Problem with prefix keys with contractions and expansions
 

=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2008-12-08 14:36:42 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -10,6 +10,6 @@
 #
 ##############################################################################
 
-ndb_partition_error2 : Bug#40989 ndb_partition_error2 needs maintenance
+ndb_partition_error2 : Bug#11750448 ndb_partition_error2 needs maintenance
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open

=== modified file 'mysql-test/suite/ndb_team/t/disabled.def'
--- a/mysql-test/suite/ndb_team/t/disabled.def	2008-01-04 14:33:01 +0000
+++ b/mysql-test/suite/ndb_team/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -9,8 +9,8 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
-ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
+ndb_autodiscover         : BUG#11745709 2006-02-16 jmiller Needs to be fixed w.r.t binlog
+ndb_autodiscover2        : BUG#11745709 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_autodiscover3        : bug#21806

=== modified file 'mysql-test/suite/parts/t/disabled.def'
--- a/mysql-test/suite/parts/t/disabled.def	2009-01-23 12:22:05 +0000
+++ b/mysql-test/suite/parts/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -1,3 +1,3 @@
-partition_basic_ndb            : Bug#19899 Crashing the server
+partition_basic_ndb            : Bug#11745782  Crashing the server
 # http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-limitations-syntax.html
-partition_syntax_ndb           : Bug#36735 Not supported
+partition_syntax_ndb           : Bug#11748568 Not supported

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2011-01-28 01:25:26 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -10,7 +10,7 @@
 #
 ##############################################################################
 
-rpl_row_create_table : Bug#51574 Feb 27 2010 andrei failed different way than earlier with bug#45576
-rpl_get_master_version_and_clock : Bug#59178 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
+rpl_row_create_table : Bug#11759274 Feb 27 2010 andrei failed different way than earlier with bug#45576
+rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
 rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
 rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out

=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2009-07-06 15:17:39 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -11,4 +11,4 @@
 ##############################################################################
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
-rpl_ndb_2ndb   : Bug#45974: rpl_ndb_2ndb fails sporadically
+rpl_ndb_2ndb   : Bug#11754374 : rpl_ndb_2ndb fails sporadically

=== modified file 'mysql-test/suite/sys_vars/t/disabled.def'
--- a/mysql-test/suite/sys_vars/t/disabled.def	2010-11-08 15:30:26 +0000
+++ b/mysql-test/suite/sys_vars/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -9,5 +9,5 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-sys_vars.max_binlog_cache_size_basic_64 : bug#56408 2010-08-31 Horst
-sys_vars.max_binlog_cache_size_basic_32 : bug#56408 2010-08-31 Horst
+sys_vars.max_binlog_cache_size_basic_64 : bug#11763668  2010-08-31 Horst
+sys_vars.max_binlog_cache_size_basic_32 : bug#11763668  2010-08-31 Horst

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-02-22 21:03:32 +0000
+++ b/mysql-test/t/disabled.def	2011-05-24 06:38:13 +0000
@@ -9,7 +9,5 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-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
-log_tables-big           : Bug#48646 2010-11-15 mattiasj report already exists
-read_many_rows_innodb    : Bug#37635 2010-11-15 mattiasj report already exists
+kill                     : Bug#11748945 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
+read_many_rows_innodb    : Bug#11748886 2010-11-15 mattiasj report already exists


Attachment: [text/bzr-bundle] bzr/anitha.gopi@oracle.com-20110524101614-p3967epj6hr6gowp.bundle
Thread
bzr push into mysql-5.1 branch (anitha.gopi:3624 to 3628) Bug#12371924Anitha Gopi24 May