From: Andrei Elkin Date: December 13 2010 2:53pm Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3241 to 3242) WL#5569 List-Archive: http://lists.mysql.com/commits/126656 Message-Id: <201012131453.oBDErCr1013722@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1406852542==" --===============1406852542== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3242 Andrei Elkin 2010-12-13 wl#5569 MTS updating results for few tests. modified: mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/suite/rpl/r/rpl_parallel.result mysql-test/suite/rpl/r/rpl_parallel_conflicts.result mysql-test/suite/sys_vars/r/all_vars.result 3241 Andrei Elkin 2010-12-11 wl#5569 MTS 1. Fixing recovery related issue of DBUG_ASSERT(rli->get_event_relay_log_pos() >= BIN_LOG_HEADER_SIZE); at slave start with shifting mts_recovery_routine() at front of the assert. 2. Making SKIP-ed event to commit to the central RLI. That is correct since Workers are not executing anything at this time. 3. Fixing the default for mts_checkpoint_period which should not be zero normally. Zero makes sense solely for debugging (so we may stress that through VALID_RANGE(1,...). 4. Introduced a general mts-unsupported error/warning to apply to cases of non-zero parallel workers and a feature that parallelization can't work with. @ mysql-test/suite/rpl/r/rpl_parallel_start_stop.result results are updated. @ mysql-test/suite/rpl/t/rpl_parallel_start_stop.test Extending the test to cover UNTIL, SKIP, a temporary to the regular error escalation. modified: mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/t/rpl_parallel_start_stop.test sql/rpl_rli_pdb.cc sql/rpl_slave.cc sql/share/errmsg-utf8.txt sql/sys_vars.cc === modified file 'mysql-test/r/mysqld--help-notwin.result' --- a/mysql-test/r/mysqld--help-notwin.result 2010-12-10 12:10:20 +0000 +++ b/mysql-test/r/mysqld--help-notwin.result 2010-12-13 14:52:50 +0000 @@ -340,9 +340,10 @@ The following options may be given as th Don't write queries to slow log that examine fewer rows than that --mts-checkpoint-period=# - Gather workers' activities and synchronously flush relay - log info to disk after every #th mili-seconds. Use 0 - (default) to disable checkpoint + Gather workers' activities to flush the relay log info to + disk after every #th milli-seconds. The zero value + disables the checkpoint routine (makes sense for + debugging). --mts-partition-hash-soft-max=# Number of records in the mts partition hash below which entries with zero usage are tolerated @@ -887,7 +888,7 @@ max-user-connections 0 max-write-lock-count 18446744073709551615 memlock FALSE min-examined-row-limit 0 -mts-checkpoint-period 0 +mts-checkpoint-period 300 mts-partition-hash-soft-max 16 mts-pending-jobs-size-max 16777216 mts-slave-worker-queue-len-max 40000 @@ -910,7 +911,7 @@ old FALSE old-alter-table FALSE old-passwords FALSE old-style-user-limits FALSE -opt-mts-coordinator-basic-nap 0 +opt-mts-coordinator-basic-nap 5 opt-mts-worker-underrun-level 0 optimizer-join-cache-level 4 optimizer-prune-level 1 === modified file 'mysql-test/r/mysqld--help-win.result' --- a/mysql-test/r/mysqld--help-win.result 2010-12-10 12:10:20 +0000 +++ b/mysql-test/r/mysqld--help-win.result 2010-12-13 14:52:50 +0000 @@ -339,9 +339,10 @@ The following options may be given as th Don't write queries to slow log that examine fewer rows than that --mts-checkpoint-period=# - Gather workers' activities and synchronously flush relay - log info to disk after every #th mili-seconds. Use 0 - (default) to disable checkpoint + Gather workers' activities to flush the relay log info to + disk after every #th milli-seconds. The zero value + disables the checkpoint routine (makes sense for + debugging). --mts-partition-hash-soft-max=# Number of records in the mts partition hash below which entries with zero usage are tolerated @@ -890,7 +891,7 @@ max-user-connections 0 max-write-lock-count 18446744073709551615 memlock FALSE min-examined-row-limit 0 -mts-checkpoint-period 0 +mts-checkpoint-period 300 mts-partition-hash-soft-max 16 mts-pending-jobs-size-max 16777216 mts-slave-worker-queue-len-max 40000 @@ -914,7 +915,7 @@ old FALSE old-alter-table FALSE old-passwords FALSE old-style-user-limits FALSE -opt-mts-coordinator-basic-nap 0 +opt-mts-coordinator-basic-nap 5 opt-mts-worker-underrun-level 0 optimizer-join-cache-level 4 optimizer-prune-level 1 === modified file 'mysql-test/suite/rpl/r/rpl_parallel.result' --- a/mysql-test/suite/rpl/r/rpl_parallel.result 2010-12-08 00:33:48 +0000 +++ b/mysql-test/suite/rpl/r/rpl_parallel.result 2010-12-13 14:52:50 +0000 @@ -4,6 +4,8 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +Warnings: +Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop. set @save.slave_parallel_workers= @@global.slave_parallel_workers; select @@global.slave_parallel_workers as 'non-zero means parallel'; non-zero means parallel @@ -11,6 +13,8 @@ non-zero means parallel call mtr.add_suppression('Slave: Error dropping database'); include/stop_slave.inc start slave; +Warnings: +Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop. stop slave sql_thread; use test; select * from test0.benchmark into outfile 'benchmark.out'; === modified file 'mysql-test/suite/rpl/r/rpl_parallel_conflicts.result' --- a/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result 2010-12-02 17:46:46 +0000 +++ b/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result 2010-12-13 14:52:50 +0000 @@ -8,6 +8,8 @@ create view coord_wait_list as SELECT i include/stop_slave.inc set @save.slave_parallel_workers= @@global.slave_parallel_workers; set @@global.slave_parallel_workers= 4; +Warnings: +Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop. include/start_slave.inc create database d1; create database d2; === modified file 'mysql-test/suite/sys_vars/r/all_vars.result' --- a/mysql-test/suite/sys_vars/r/all_vars.result 2010-12-08 00:33:48 +0000 +++ b/mysql-test/suite/sys_vars/r/all_vars.result 2010-12-13 14:52:50 +0000 @@ -18,6 +18,7 @@ OPT_MTS_WORKER_UNDERRUN_LEVEL SLAVE_RUN_QUERY_IN_PARALLEL INNODB_STATS_PERSISTENT_SAMPLE_PAGES RELAY_LOG_BASENAME +MTS_CHECKPOINT_PERIOD LOG_BIN_BASENAME INNODB_ANALYZE_IS_PERSISTENT INNODB_RESET_MONITOR_COUNTER @@ -37,6 +38,7 @@ OPT_MTS_WORKER_UNDERRUN_LEVEL SLAVE_RUN_QUERY_IN_PARALLEL INNODB_STATS_PERSISTENT_SAMPLE_PAGES RELAY_LOG_BASENAME +MTS_CHECKPOINT_PERIOD LOG_BIN_BASENAME INNODB_ANALYZE_IS_PERSISTENT INNODB_RESET_MONITOR_COUNTER --===============1406852542== 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: f08b252da41ff8638df8978670a42f76180003ae # timestamp: 2010-12-13 16:53:12 +0200 # base_revision_id: andrei.elkin@stripped\ # 4193ws2j1a8xdgwb # # Begin bundle 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 --===============1406852542==--