From: Anitha Gopi Date: May 23 2011 12:01pm Subject: bzr push into mysql-5.5 branch (anitha.gopi:3392 to 3393) List-Archive: http://lists.mysql.com/commits/137854 Message-Id: <201105231201.p4NC1gX3027419@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1172240900==" --===============1172240900== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3393 Anitha Gopi 2011-05-23 Replaced all bug numbers with Oracle bugDB numbers modified: mysql-test/collections/default.experimental mysql-test/suite/binlog/t/disabled.def mysql-test/suite/federated/disabled.def mysql-test/suite/rpl/t/disabled.def mysql-test/suite/sys_vars/t/disabled.def mysql-test/t/disabled.def 3392 Vasil Dimov 2011-05-22 [merge] Merge mysql-5.1 -> mysql-5.5 (empty) === modified file 'mysql-test/collections/default.experimental' --- a/mysql-test/collections/default.experimental 2011-05-21 08:21:08 +0000 +++ b/mysql-test/collections/default.experimental 2011-05-23 11:33:41 +0000 @@ -6,21 +6,23 @@ binlog.binlog_bug23533 funcs_1.charset_collation_1 # depends on compile-time decisions -main.func_math @freebsd # Bug#43020 2010-05-04 alik main.func_math fails on FreeBSD in PB2 -main.gis-rtree @freebsd # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server -main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically -main.signal_demo3 @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun -main.sp @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun -main.type_float @freebsd # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server -main.wait_timeout @solaris # Bug#51244 2010-04-26 alik wait_timeout fails on OpenSolaris +main.func_math @freebsd # Bug#11751977 2010-05-04 alik main.func_math fails on FreeBSD in PB2 +main.gis-rtree @freebsd # Bug#11749418 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server +main.lock_multi_bug38499 # Bug#11755645 2009-09-19 alik main.lock_multi_bug38499 times out sporadically +main.outfile_loaddata @solaris # Bug#11755168 2010-01-20 alik Test "outfile_loaddata" fails (reproducible) +main.signal_demo3 @solaris # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun +main.sp @solaris # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun +main.type_float @freebsd # Bug#11749418 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server +main.wait_timeout @solaris # Bug#11758972 2010-04-26 alik wait_timeout fails on OpenSolaris +rpl.rpl_innodb_bug28430 # Bug#11754425 +rpl.rpl_bug37426 # WL#5867: skozlov: test case moved from unused bugs suite rpl.rpl_heartbeat_basic # BUG#12403008 2011-04-27 sven fails sporadically -rpl.rpl_innodb_bug28430 # Bug#46029 rpl.rpl_show_slave_hosts # BUG#12416700 2011-05-02 sven fails sporadically -sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun -sys_vars.plugin_dir_basic # Bug#52223 2010-11-24 alik Test "plugin_dir_basic" does not support RPM build (test) directory structure -sys_vars.wait_timeout_func # Bug#41255 2010-04-26 alik wait_timeout_func fails +sys_vars.max_sp_recursion_depth_func @solaris # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun +sys_vars.plugin_dir_basic # Bug#11759877 2010-11-24 alik Test "plugin_dir_basic" does not support RPM build (test) directory structure +sys_vars.wait_timeout_func # Bug#11750645 2010-04-26 alik wait_timeout_func fails # BUG #59055 : All ndb tests should be removed from the repository # Leaving the sys_vars tests for now. sys_vars.all_vars.test fails on removing ndb tests @@ -29,6 +31,6 @@ sys_vars.have_ndbcluster_basic sys_vars.ndb_log_updated_only_basic sys_vars.rpl_init_slave_func # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5 -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 2011-03-24 14:39:45 +0000 +++ b/mysql-test/suite/binlog/t/disabled.def 2011-05-23 11:33:41 +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_spurious_ddl_errors : BUG#54195 2010-06-03 alik binlog_spurious_ddl_errors.test fails, thus disabled +binlog_truncate_innodb : BUG#11764459 2010-10-20 anitha Originally disabled due to BUG#42643. Product bug fixed, but test changes needed +binlog_spurious_ddl_errors : BUG#11761680 2010-06-03 alik binlog_spurious_ddl_errors.test fails, thus disabled === 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-23 11:33:41 +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/rpl/t/disabled.def' --- a/mysql-test/suite/rpl/t/disabled.def 2011-02-15 12:01:52 +0000 +++ b/mysql-test/suite/rpl/t/disabled.def 2011-05-23 11:33:41 +0000 @@ -10,8 +10,8 @@ # ############################################################################## -rpl_row_create_table : Bug#51574 2010-02-27 andrei failed different way than earlier with bug#45576 -rpl_spec_variables : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux -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 2010-02-27 andrei failed different way than earlier with bug#45576 +rpl_spec_variables : BUG#11755836 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux +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/sys_vars/t/disabled.def' --- a/mysql-test/suite/sys_vars/t/disabled.def 2009-12-22 09:35:56 +0000 +++ b/mysql-test/suite/sys_vars/t/disabled.def 2011-05-23 11:33:41 +0000 @@ -9,9 +9,9 @@ # Do not use any TAB characters for whitespace. # ############################################################################## -query_cache_size_basic_32 : Bug#36747: Allocating a large query cache is not deterministic -query_cache_size_basic_64 : Bug#36747: Allocating a large query cache is not deterministic -transaction_prealloc_size_basic_32 : Bug#36747 -transaction_prealloc_size_basic_64 : Bug#36747 -#thread_cache_size_func : Bug#40575: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads +query_cache_size_basic_32 : Bug#11748572: Allocating a large query cache is not deterministic +query_cache_size_basic_64 : Bug#11748572: Allocating a large query cache is not deterministic +transaction_prealloc_size_basic_32 : Bug#11748572 +transaction_prealloc_size_basic_64 : Bug#11748572 +#thread_cache_size_func : Bug#11750172: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads === modified file 'mysql-test/t/disabled.def' --- a/mysql-test/t/disabled.def 2011-03-11 09:12:58 +0000 +++ b/mysql-test/t/disabled.def 2011-05-23 11:33:41 +0000 @@ -9,11 +9,11 @@ # Do not use any TAB characters for whitespace. # ############################################################################## -lowercase_table3 : Bug#54845 2010-06-30 alik main.lowercase_table3 on Mac OSX +lowercase_table3 : Bug#11762269 2010-06-30 alik main.lowercase_table3 on Mac OSX 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 -sum_distinct-big : Bug#56927 2010-11-15 mattiasj was not tested -alter_table-big : Bug#37248 2010-11-15 mattiasj was not tested -create-big : Bug#37248 2010-11-15 mattiasj was not tested +log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists +read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists +sum_distinct-big : Bug#11764126 2010-11-15 mattiasj was not tested +alter_table-big : Bug#11748731 2010-11-15 mattiasj was not tested +create-big : Bug#11748731 2010-11-15 mattiasj was not tested archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc --===============1172240900== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/anitha.gopi@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: anitha.gopi@stripped # target_branch: file:///home/anitha/mysql/repo/mysql-5.5/ # testament_sha1: 1349fcd1b43b6dea9aaece95e5d7b32d5e94ca5b # timestamp: 2011-05-23 17:31:33 +0530 # source_branch: file:///home/anitha/mysql/repo/mysql-5.5/ # base_revision_id: vasil.dimov@stripped\ # 46b4fd5fh7z68utk # # Begin bundle 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 --===============1172240900==--