From: Alexander Nozdrin Date: September 21 2012 10:50am Subject: bzr push into mysql-5.6 branch (alexander.nozdrin:4307 to 4310) List-Archive: http://lists.mysql.com/commits/144836 Message-Id: <20120921105004.24810.4208.4310@quad> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4310 Alexander Nozdrin 2012-09-21 Backport of rev-id: alexander.nozdrin@stripped from mysql-trunk: # committer: Alexander Nozdrin # timestamp: Fri 2012-09-21 14:23:45 +0400 # message: # Bug#14620456: update default.experimental. modified: mysql-test/collections/default.experimental 4309 Alexander Nozdrin 2012-09-21 Backport of rev-id: alexander.nozdrin@stripped from mysql-trunk: # committer: Alexander Nozdrin # timestamp: Wed 2012-09-19 13:09:22 +0400 # message: # Bug#14620456: TESTS FAIL WITH THE "THREAD STACK OVERRUN" MESSAGE. # # Remove fixed tests from the experimental list. modified: mysql-test/collections/default.experimental 4308 Alexander Nozdrin 2012-09-21 Backport of rev-id: alexander.nozdrin@stripped from mysql-trunk: # committer: Alexander Nozdrin # timestamp: Mon 2012-09-17 16:39:22 +0400 # message: # A patch for Bug#14620456 (TESTS FAIL WITH THE "THREAD STACK OVERRUN" MESSAGE). # # The problem was that the default thread stack is not enough for some tests to pass # on certain platforms (especially SPARC64). # # The patch adds a way to override thread stack size for a particular platform. added: mysql-test/suite/funcs_1/t/innodb_trig_1011ext-master.opt mysql-test/suite/funcs_1/t/memory_trig_1011ext-master.opt mysql-test/suite/funcs_1/t/myisam_trig_1011ext-master.opt mysql-test/suite/rpl/t/rpl_mix_found_rows-master.opt mysql-test/suite/rpl/t/rpl_row_sp011-master.opt mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func-master.opt mysql-test/t/bug33509-master.opt mysql-test/t/mix2_myisam-master.opt mysql-test/t/signal_demo3-master.opt mysql-test/t/sp-fib-master.opt mysql-test/t/sp-lock-master.opt mysql-test/t/sp-master.opt mysql-test/t/sp-prelocking-master.opt 4307 Jimmy Yang 2012-09-21 Fix Bug #14622815 ASSERT THR_GET_TRX(THR)->ERROR_STATE == DB_SUCCESS, COMMIT, FTS RELATED rb://1322 approved by Sunny Bains modified: mysql-test/suite/innodb_fts/r/fulltext.result storage/innobase/fts/fts0fts.cc storage/innobase/fts/fts0que.cc storage/innobase/include/fts0priv.h === modified file 'mysql-test/collections/default.experimental' --- a/mysql-test/collections/default.experimental 2012-09-12 14:44:12 +0000 +++ b/mysql-test/collections/default.experimental 2012-09-21 10:49:03 +0000 @@ -4,38 +4,22 @@ binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin funcs_1.charset_collation_1 # depends on compile-time decisions -funcs_1.innodb_trig_1011ext @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun -funcs_1.myisam_trig_1011ext @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun -funcs_1.memory_trig_1011ext @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun main.func_math @freebsd # Bug#11751977 2010-05-04 alik main.func_math fails on FreeBSD in PB2 main.mysqlslap @windows # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia -main.signal_demo3 @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun -main.sp @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun - -main.bug33509 @solaris # Bug#11753919 2012-02-16 didrik Several test cases fail on Solaris with error Thread stack overrun main.index_merge_innodb # BUG#11754168 2012-05-08 jorgen Doing an attempt at reenabling tests disabled by bug. EXPLAIN's row estimates varies for innodb so marked experimental for a while main.kill @freebsd # Bug#12619719 2011-08-04 Occasional failure in PB2 main.kill @darwin # Bug#12619719 2012-07-12 Occasional failure in PB2 -main.mix2_myisam @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun -main.sp-lock @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun -main.sp-prelocking @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun -main.sp-fib @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun innodb.innodb_monitor # Bug#12320827 2011-08-04 Occasional failure in PB2 rpl.rpl_delayed_slave # BUG#11764654 rpl_delayed_slave fails sporadically in pb rpl.rpl_innodb_bug28430 # Bug#11754425 -rpl.rpl_row_sp011 @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun rpl.rpl_seconds_behind_master # BUG#11765124 2010-11-24 luis fails sporadically on pb2 rpl.rpl_show_slave_running # BUG#12346048 2011-04-11 sven fails sporadically on pb2 rpl.rpl_parallel_switch_sequential # BUG#13626976 2012-02-07 dlenev Fails sporadically on pb2 rpl.rpl_report_port # BUG#13812374 2012-05-10 Hemant Fails after the post fix for bug#13812374 -rpl.rpl_switch_stm_row_mixed @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun -rpl.rpl_mix_found_rows @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun -rpl.rpl_insert_id @solaris # Bug#11753919 2012-05-22 Hemant Several test cases fail on Solaris with error Thread stack overrun -sys_vars.max_sp_recursion_depth_func @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun # 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 === added file 'mysql-test/suite/funcs_1/t/innodb_trig_1011ext-master.opt' --- a/mysql-test/suite/funcs_1/t/innodb_trig_1011ext-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/funcs_1/t/innodb_trig_1011ext-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/suite/funcs_1/t/memory_trig_1011ext-master.opt' --- a/mysql-test/suite/funcs_1/t/memory_trig_1011ext-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/funcs_1/t/memory_trig_1011ext-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/suite/funcs_1/t/myisam_trig_1011ext-master.opt' --- a/mysql-test/suite/funcs_1/t/myisam_trig_1011ext-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/funcs_1/t/myisam_trig_1011ext-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/suite/rpl/t/rpl_mix_found_rows-master.opt' --- a/mysql-test/suite/rpl/t/rpl_mix_found_rows-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/rpl/t/rpl_mix_found_rows-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/suite/rpl/t/rpl_row_sp011-master.opt' --- a/mysql-test/suite/rpl/t/rpl_row_sp011-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/rpl/t/rpl_row_sp011-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func-master.opt' --- a/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/t/bug33509-master.opt' --- a/mysql-test/t/bug33509-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/t/bug33509-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/t/mix2_myisam-master.opt' --- a/mysql-test/t/mix2_myisam-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/t/mix2_myisam-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/t/signal_demo3-master.opt' --- a/mysql-test/t/signal_demo3-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/t/signal_demo3-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/t/sp-fib-master.opt' --- a/mysql-test/t/sp-fib-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/t/sp-fib-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/t/sp-lock-master.opt' --- a/mysql-test/t/sp-lock-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/t/sp-lock-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/t/sp-master.opt' --- a/mysql-test/t/sp-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/t/sp-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} === added file 'mysql-test/t/sp-prelocking-master.opt' --- a/mysql-test/t/sp-prelocking-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/t/sp-prelocking-master.opt 2012-09-21 10:46:08 +0000 @@ -0,0 +1 @@ +${?PB_HOST_SPECIFIC_MYSQLD_ARGS} No bundle (reason: useless for push emails).