From: Andrei Elkin Date: December 17 2010 12:46pm Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3248 to 3249) WL#5569 List-Archive: http://lists.mysql.com/commits/127191 Message-Id: <201012171246.oBHCkuKL027261@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0541676730==" --===============0541676730== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3249 Andrei Elkin 2010-12-17 wl#5569 MTS fixing PB2 failures, incl valgrind issues, long exec time and asserting in a test. @ mysql-test/extra/rpl_tests/rpl_parallel_load.test Making slow win machines happy on PB2 to lessen load. @ mysql-test/suite/rpl/t/rpl_parallel_start_stop.test adding an assert and print out if one will fire. @ sql/rpl_rli_pdb.cc the \0 term char was not allocated. @ sql/rpl_slave.cc missed initialization is added. modified: mysql-test/extra/rpl_tests/rpl_parallel_load.test mysql-test/suite/rpl/t/rpl_parallel.test mysql-test/suite/rpl/t/rpl_parallel_start_stop.test sql/rpl_rli_pdb.cc sql/rpl_slave.cc 3248 Andrei Elkin 2010-12-17 [merge] merge from wl#5569 repo to local branch rpl_sequential opt files are added to avoid mtr give up to process a bulk of unsafe warnings. added: mysql-test/suite/rpl/t/rpl_sequential-master.opt mysql-test/suite/rpl/t/rpl_sequential-slave.opt modified: mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_crash_safe.result scripts/mysql_system_tables.sql sql/rpl_info_dummy.cc sql/rpl_info_dummy.h sql/rpl_info_factory.cc sql/rpl_info_file.cc sql/rpl_info_file.h sql/rpl_info_handler.h sql/rpl_info_table.cc sql/rpl_info_table.h sql/rpl_info_table_access.cc sql/rpl_mi.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_rli_pdb.cc sql/rpl_rli_pdb.h sql/rpl_slave.cc === modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load.test' --- a/mysql-test/extra/rpl_tests/rpl_parallel_load.test 2010-12-16 21:41:45 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_parallel_load.test 2010-12-17 12:46:15 +0000 @@ -7,6 +7,15 @@ # let $iter = 1000; + +# windows run on PB2 is too slow to time out +disable_query_log; +if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as "TRUE"`) +{ + let $iter = 100; +} +enable_query_log; + let $databases = 4; connection slave; === modified file 'mysql-test/suite/rpl/t/rpl_parallel.test' --- a/mysql-test/suite/rpl/t/rpl_parallel.test 2010-12-16 21:41:45 +0000 +++ b/mysql-test/suite/rpl/t/rpl_parallel.test 2010-12-17 12:46:15 +0000 @@ -34,7 +34,6 @@ # source include/master-slave.inc; -# source include/have_binlog_format_row.inc; connection slave; set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; === modified file 'mysql-test/suite/rpl/t/rpl_parallel_start_stop.test' --- a/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test 2010-12-14 08:57:16 +0000 +++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test 2010-12-17 12:46:15 +0000 @@ -113,6 +113,12 @@ connection master; sync_slave_with_master; #connection slave; +if (`select count(*) != 3 from t1`) +{ + query_vertical show slave status; + --die Wrong recovery after restart +} + # cleanup but leaving on t1 connection master; === modified file 'sql/rpl_rli_pdb.cc' --- a/sql/rpl_rli_pdb.cc 2010-12-16 22:00:47 +0000 +++ b/sql/rpl_rli_pdb.cc 2010-12-17 12:46:15 +0000 @@ -334,6 +334,8 @@ Slave_worker *get_slave_worker(const cha my_hash_value_type hash_value; uchar dblength= (uint) strlen(dbname); + DBUG_ASSERT(dblength != 0); + // Search in CGAP for (i= 0; i < rli->curr_group_assigned_parts.elements; i++) { @@ -387,7 +389,7 @@ Slave_worker *get_slave_worker(const cha Allocate an entry to be inserted and if the operation fails an error is returned. */ - if (!(db= (char *) my_malloc((size_t)dblength, MYF(0)))) + if (!(db= (char *) my_malloc((size_t) dblength + 1, MYF(0)))) goto err; if (!(entry= (db_worker *) my_malloc(sizeof(db_worker), MYF(0)))) { === modified file 'sql/rpl_slave.cc' --- a/sql/rpl_slave.cc 2010-12-16 22:00:47 +0000 +++ b/sql/rpl_slave.cc 2010-12-17 12:46:15 +0000 @@ -4143,6 +4143,7 @@ int slave_start_workers(Relay_log_info * rli->mts_pending_jobs_size_max= ::opt_mts_pending_jobs_size_max; rli->mts_wqs_underrun_w_id= (ulong) -1; rli->mts_wqs_overrun= 0; + rli->mts_wqs_oversize= FALSE; rli->mts_coordinator_basic_nap= ::opt_mts_coordinator_basic_nap; rli->mts_worker_underrun_level= ::opt_mts_worker_underrun_level; rli->mts_total_groups= 0; --===============0541676730== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/andrei.elkin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: b5616a650a89dc6e73ef8741156a3345cbc6009f # timestamp: 2010-12-17 14:46:56 +0200 # base_revision_id: andrei.elkin@stripped\ # m2jph3ne5zaz3vge # # Begin bundle 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 --===============0541676730==--