From: Andrei Elkin Date: December 14 2010 8:57am Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3245) WL#5569 List-Archive: http://lists.mysql.com/commits/126723 Message-Id: <201012140857.oBE8vTo0019856@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2100085083==" --===============2100085083== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped 3245 Andrei Elkin 2010-12-14 wl#5569 MTS a light cleanup to arrange the option/system var names properly - mts_-prefixing, and _exp prefixing for experimental features needed for benchmarking (mts_exp_slave_local_timestamp) or suppored limitly (mts_exp_slave_run_query_in_parallel for Query-log-event). Fixing GAQ size. It might be too tight e.g in case of the max WQ length of 1; tested with running rpl_parallel supplying --mts-slave-worker-queue-len-max=1. @ sql/rpl_slave.cc Fixing GAQ size. It might be too tight e.g in case of the max WQ length of 1. modified: mysql-test/extra/rpl_tests/rpl_parallel_load.test mysql-test/r/mysqld--help-notwin.result mysql-test/suite/rpl/r/rpl_parallel.result mysql-test/suite/rpl/r/rpl_parallel_conflicts.result mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/r/rpl_sequential.result mysql-test/suite/rpl/t/rpl_parallel-slave.opt mysql-test/suite/rpl/t/rpl_parallel.test mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test mysql-test/suite/rpl/t/rpl_parallel_conflicts.test mysql-test/suite/rpl/t/rpl_parallel_start_stop.test mysql-test/suite/rpl/t/rpl_sequential.test sql/log_event.cc sql/mysqld.cc sql/mysqld.h sql/rpl_rli_pdb.cc sql/rpl_slave.cc sql/sys_vars.cc === modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load.test' --- a/mysql-test/extra/rpl_tests/rpl_parallel_load.test 2010-12-07 17:35:16 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_parallel_load.test 2010-12-14 08:57:16 +0000 @@ -209,7 +209,8 @@ insert into test0.benchmark set state='s # To force filling timestamp cols with the slave local clock values # to implement benchmarking. -set @@global.slave_local_timestamp=1; +set @save.mts_exp_slave_local_timestamp=@@global.mts_exp_slave_local_timestamp; +set @@global.mts_exp_slave_local_timestamp=1; start slave sql_thread; let $wait_timeout= 600; @@ -262,6 +263,6 @@ while($i) sync_slave_with_master; #connection slave; - +set @@global.mts_exp_slave_local_timestamp= @save.mts_exp_slave_local_timestamp; # End of the tests === modified file 'mysql-test/r/mysqld--help-notwin.result' --- a/mysql-test/r/mysqld--help-notwin.result 2010-12-13 14:52:50 +0000 +++ b/mysql-test/r/mysqld--help-notwin.result 2010-12-14 08:57:16 +0000 @@ -344,6 +344,16 @@ The following options may be given as th disk after every #th milli-seconds. The zero value disables the checkpoint routine (makes sense for debugging). + --mts-coordinator-basic-nap=# + Time in msec to sleep by MTS Coordinator to avoid the + Worker queues room overrun + --mts-exp-slave-local-timestamp + If enabled slave itself computes the event appying time + value to implicitly affected timestamp columms. Otherwise + (default) it installs prescribed by the master value + --mts-exp-slave-run-query-in-parallel + The default not an actual database name is used as + partition info for parallel execution of Query_log_event --mts-partition-hash-soft-max=# Number of records in the mts partition hash below which entries with zero usage are tolerated @@ -351,6 +361,8 @@ The following options may be given as th Max size of Slave Worker queues holding yet not applied events.The least possible value must be not less than the master size max_allowed_packet. + --mts-slave-parallel-workers=# + Number of worker threads for executing events in parallel --mts-slave-worker-queue-len-max=# Max length of one MTS Worker queue. Presence in the queue indicates a replication event was read out of Relay log @@ -359,6 +371,9 @@ The following options may be given as th Whichever limit is reached Coordinator threadsuspends further jobs assigning until conditions have been improved. + --mts-worker-underrun-level=# + percent of Worker queue size at which Worker is + considered to become hungry --multi-range-count=# Number of key ranges to request at once --myisam-block-size=# @@ -413,12 +428,6 @@ The following options may be given as th value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors - --opt-mts-coordinator-basic-nap=# - Time in msec to sleep by MTS Coordinator to avoid the - Worker queues room overrun - --opt-mts-worker-underrun-level=# - percent of Worker queue size at which Worker is - considered to become hungry --optimizer-join-cache-level=# Controls what join operations can be executed with join buffers. Odd numbers are used for plain join buffers @@ -657,18 +666,9 @@ The following options may be given as th --slave-load-tmpdir=name The location where the slave should put its temporary files when replicating a LOAD DATA INFILE command - --slave-local-timestamp - if enabled slave computes the event appying time value to - implicitly affected timestamp columms. Otherwise - (default) installs prescribed by the master value --slave-net-timeout=# Number of seconds to wait for more data from a master/slave connection before aborting the read - --slave-parallel-workers=# - Number of worker threads for executing events in parallel - --slave-run-query-in-parallel - The default not an actual database name is used as - partition info for parallel execution of Query_log_event --slave-skip-errors=name Tells the slave thread to continue replication when a query event returns an error from the provided list @@ -889,9 +889,14 @@ max-write-lock-count 1844674407370955161 memlock FALSE min-examined-row-limit 0 mts-checkpoint-period 300 +mts-coordinator-basic-nap 5 +mts-exp-slave-local-timestamp FALSE +mts-exp-slave-run-query-in-parallel FALSE mts-partition-hash-soft-max 16 mts-pending-jobs-size-max 16777216 +mts-slave-parallel-workers 0 mts-slave-worker-queue-len-max 40000 +mts-worker-underrun-level 0 multi-range-count 256 myisam-block-size 1024 myisam-data-pointer-size 6 @@ -911,8 +916,6 @@ old FALSE old-alter-table FALSE old-passwords FALSE old-style-user-limits FALSE -opt-mts-coordinator-basic-nap 5 -opt-mts-worker-underrun-level 0 optimizer-join-cache-level 4 optimizer-prune-level 1 optimizer-search-depth 62 @@ -975,10 +978,7 @@ skip-show-database FALSE skip-slave-start FALSE slave-compressed-protocol FALSE slave-exec-mode STRICT -slave-local-timestamp FALSE slave-net-timeout 3600 -slave-parallel-workers 0 -slave-run-query-in-parallel FALSE slave-skip-errors (No default value) slave-sql-verify-checksum TRUE slave-transaction-retries 10 === modified file 'mysql-test/suite/rpl/r/rpl_parallel.result' --- a/mysql-test/suite/rpl/r/rpl_parallel.result 2010-12-13 14:52:50 +0000 +++ b/mysql-test/suite/rpl/r/rpl_parallel.result 2010-12-14 08:57:16 +0000 @@ -6,8 +6,8 @@ drop table if exists t1,t2,t3,t4,t5,t6,t 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'; +set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; +select @@global.mts_slave_parallel_workers as 'non-zero means parallel'; non-zero means parallel 4 call mtr.add_suppression('Slave: Error dropping database'); @@ -28,4 +28,5 @@ Comparing tables master:test3.tm_nk and Comparing tables master:test2.tm_nk and slave:test2.tm_nk Comparing tables master:test1.tm_nk and slave:test1.tm_nk Comparing tables master:test0.tm_nk and slave:test0.tm_nk -set @@global.slave_parallel_workers= @save.slave_parallel_workers; +set @@global.mts_exp_slave_local_timestamp= @save.mts_exp_slave_local_timestamp; +set @@global.mts_slave_parallel_workers= @save.mts_slave_parallel_workers; === modified file 'mysql-test/suite/rpl/r/rpl_parallel_conflicts.result' --- a/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result 2010-12-13 14:52:50 +0000 +++ b/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result 2010-12-14 08:57:16 +0000 @@ -6,8 +6,8 @@ drop table if exists t1,t2,t3,t4,t5,t6,t start slave; create view coord_wait_list as SELECT id from Information_Schema.processlist where state like 'Waiting for Slave Worker%'; include/stop_slave.inc -set @save.slave_parallel_workers= @@global.slave_parallel_workers; -set @@global.slave_parallel_workers= 4; +set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; +set @@global.mts_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 @@ -77,5 +77,5 @@ drop database d1; drop database d2; drop database d3; drop view coord_wait_list; -set @@global.slave_parallel_workers= @save.slave_parallel_workers; +set @@global.mts_slave_parallel_workers= @save.mts_slave_parallel_workers; *** End of the tests *** === modified file 'mysql-test/suite/rpl/r/rpl_parallel_start_stop.result' --- a/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result 2010-12-11 19:00:47 +0000 +++ b/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result 2010-12-14 08:57:16 +0000 @@ -8,8 +8,8 @@ create view worker_proc_list as SELECT i where state like 'Waiting for an event from sql thread%'; create view coord_proc_list as SELECT id from Information_Schema.processlist where state like 'Slave has read all relay log%'; include/stop_slave.inc -set @save.slave_parallel_workers= @@global.slave_parallel_workers; -set @@global.slave_parallel_workers= 4; +set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; +set @@global.mts_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 @@ -81,6 +81,6 @@ drop table t2m; drop table t2; drop view worker_proc_list; drop view coord_proc_list; -set @@global.slave_parallel_workers= @save.slave_parallel_workers; +set @@global.mts_slave_parallel_workers= @save.mts_slave_parallel_workers; set @@global.slave_transaction_retries= @save.slave_transaction_retries; end of the tests === modified file 'mysql-test/suite/rpl/r/rpl_sequential.result' --- a/mysql-test/suite/rpl/r/rpl_sequential.result 2010-12-07 17:35:16 +0000 +++ b/mysql-test/suite/rpl/r/rpl_sequential.result 2010-12-14 08:57:16 +0000 @@ -4,8 +4,8 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -set @save.slave_parallel_workers= 0; -select @@global.slave_parallel_workers as 'zero'; +set @save.mts_slave_parallel_workers= 0; +select @@global.mts_slave_parallel_workers as 'zero'; zero 0 call mtr.add_suppression('Slave: Error dropping database'); @@ -24,3 +24,4 @@ Comparing tables master:test3.tm_nk and Comparing tables master:test2.tm_nk and slave:test2.tm_nk Comparing tables master:test1.tm_nk and slave:test1.tm_nk Comparing tables master:test0.tm_nk and slave:test0.tm_nk +set @@global.mts_exp_slave_local_timestamp= @save.mts_exp_slave_local_timestamp; === modified file 'mysql-test/suite/rpl/t/rpl_parallel-slave.opt' --- a/mysql-test/suite/rpl/t/rpl_parallel-slave.opt 2010-12-09 16:17:32 +0000 +++ b/mysql-test/suite/rpl/t/rpl_parallel-slave.opt 2010-12-14 08:57:16 +0000 @@ -1 +1 @@ ---slave-parallel-workers=4 +--mts-slave-parallel-workers=4 === modified file 'mysql-test/suite/rpl/t/rpl_parallel.test' --- a/mysql-test/suite/rpl/t/rpl_parallel.test 2010-12-08 00:33:48 +0000 +++ b/mysql-test/suite/rpl/t/rpl_parallel.test 2010-12-14 08:57:16 +0000 @@ -37,12 +37,12 @@ source include/master-slave.inc; source include/have_binlog_format_row.inc; connection slave; -set @save.slave_parallel_workers= @@global.slave_parallel_workers; -select @@global.slave_parallel_workers as 'non-zero means parallel'; -let $workers = `select @@global.slave_parallel_workers`; +set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; +select @@global.mts_slave_parallel_workers as 'non-zero means parallel'; +let $workers = `select @@global.mts_slave_parallel_workers`; connection master; source extra/rpl_tests/rpl_parallel_load.test; connection slave; -set @@global.slave_parallel_workers= @save.slave_parallel_workers; +set @@global.mts_slave_parallel_workers= @save.mts_slave_parallel_workers; === modified file 'mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test' --- a/mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test 2010-12-07 17:35:16 +0000 +++ b/mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test 2010-12-14 08:57:16 +0000 @@ -20,8 +20,8 @@ create view coord_wait_list as # restart in Parallel source include/stop_slave.inc; -set @save.slave_parallel_workers= @@global.slave_parallel_workers; -set @@global.slave_parallel_workers= 4; +set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; +set @@global.mts_slave_parallel_workers= 4; # max len of WQ @@ -209,6 +209,6 @@ sync_slave_with_master; #connection slave; drop view coord_wait_list; -set @@global.slave_parallel_workers= @save.slave_parallel_workers; +set @@global.mts_slave_parallel_workers= @save.mts_slave_parallel_workers; === modified file 'mysql-test/suite/rpl/t/rpl_parallel_conflicts.test' --- a/mysql-test/suite/rpl/t/rpl_parallel_conflicts.test 2010-12-07 17:35:16 +0000 +++ b/mysql-test/suite/rpl/t/rpl_parallel_conflicts.test 2010-12-14 08:57:16 +0000 @@ -46,8 +46,8 @@ create view coord_wait_list as SELECT i source include/stop_slave.inc; -set @save.slave_parallel_workers= @@global.slave_parallel_workers; -set @@global.slave_parallel_workers= 4; +set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; +set @@global.mts_slave_parallel_workers= 4; source include/start_slave.inc; @@ -209,7 +209,7 @@ sync_slave_with_master; #connection slave; drop view coord_wait_list; -set @@global.slave_parallel_workers= @save.slave_parallel_workers; +set @@global.mts_slave_parallel_workers= @save.mts_slave_parallel_workers; --echo *** End of the tests *** === 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-11 19:00:47 +0000 +++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test 2010-12-14 08:57:16 +0000 @@ -19,12 +19,12 @@ create view coord_proc_list as SELECT i source include/stop_slave.inc; -set @save.slave_parallel_workers= @@global.slave_parallel_workers; -set @@global.slave_parallel_workers= 4; +set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers; +set @@global.mts_slave_parallel_workers= 4; source include/start_slave.inc; -let $count= `select @@global.slave_parallel_workers`; +let $count= `select @@global.mts_slave_parallel_workers`; let $table= worker_proc_list; source include/wait_until_rows_count.inc; @@ -47,7 +47,7 @@ source include/start_slave.inc; # testing of the poll is up -let $count= `select @@global.slave_parallel_workers`; +let $count= `select @@global.mts_slave_parallel_workers`; let $table= worker_proc_list; source include/wait_until_rows_count.inc; @@ -262,7 +262,7 @@ sync_slave_with_master; drop view worker_proc_list; drop view coord_proc_list; -set @@global.slave_parallel_workers= @save.slave_parallel_workers; +set @@global.mts_slave_parallel_workers= @save.mts_slave_parallel_workers; set @@global.slave_transaction_retries= @save.slave_transaction_retries; --echo end of the tests === modified file 'mysql-test/suite/rpl/t/rpl_sequential.test' --- a/mysql-test/suite/rpl/t/rpl_sequential.test 2010-12-02 17:46:46 +0000 +++ b/mysql-test/suite/rpl/t/rpl_sequential.test 2010-12-14 08:57:16 +0000 @@ -9,8 +9,8 @@ source include/master-slave.inc; connection slave; -set @save.slave_parallel_workers= 0; -select @@global.slave_parallel_workers as 'zero'; +set @save.mts_slave_parallel_workers= 0; +select @@global.mts_slave_parallel_workers as 'zero'; connection master; === modified file 'sql/log_event.cc' --- a/sql/log_event.cc 2010-12-10 15:50:03 +0000 +++ b/sql/log_event.cc 2010-12-14 08:57:16 +0000 @@ -2432,7 +2432,7 @@ Slave_worker *Log_event::get_slave_worke // the last occupied GAQ's array index gaq_idx= rli->gaq->assigned_group_index= rli->gaq->en_queue((void *) &g); - DBUG_ASSERT(gaq_idx != (ulong) -1); + DBUG_ASSERT(gaq_idx != (ulong) -1 && gaq_idx < rli->gaq->s); DBUG_ASSERT(((Slave_job_group *) dynamic_array_ptr(&rli->gaq->Q, rli->gaq->assigned_group_index))-> group_relay_log_name == NULL); @@ -4146,7 +4146,7 @@ int Query_log_event::do_apply_event(Rela */ if (is_trans_keyword() || rpl_filter->db_ok(thd->db)) { - thd->set_time(!slave_local_timestamp_opt ? (time_t)when : my_time(0)); + thd->set_time(!opt_mts_slave_local_timestamp ? (time_t)when : my_time(0)); //thd->set_query_and_id((char*)query_arg, q_len_arg, next_query_id()); thd->set_query_and_id((char*)query_arg, q_len_arg, thd->charset(), next_query_id()); @@ -5856,7 +5856,7 @@ int Load_log_event::do_apply_event(NET* */ if (rpl_filter->db_ok(thd->db)) { - thd->set_time(!slave_local_timestamp_opt ? (time_t)when : my_time(0)); + thd->set_time(!opt_mts_slave_local_timestamp ? (time_t)when : my_time(0)); thd->set_query_id(next_query_id()); thd->warning_info->opt_clear_warning_info(thd->query_id); @@ -8704,7 +8704,7 @@ int Rows_log_event::do_apply_event(Relay TIMESTAMP column to a table with one. So we call set_time(), like in SBR. Presently it changes nothing. */ - thd->set_time(!slave_local_timestamp_opt ? (time_t)when : my_time(0)); + thd->set_time(!opt_mts_slave_local_timestamp ? (time_t)when : my_time(0)); /* Now we are in a statement and will stay in a statement until we === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2010-12-10 12:10:20 +0000 +++ b/sql/mysqld.cc 2010-12-14 08:57:16 +0000 @@ -461,10 +461,10 @@ ulong slave_trans_retries; uint slave_net_timeout; ulong slave_exec_mode_options; ulonglong slave_type_conversions_options; -ulong opt_slave_parallel_workers; +ulong opt_mts_slave_parallel_workers; ulong opt_mts_slave_worker_queue_len_max; -my_bool slave_local_timestamp_opt; -my_bool opt_slave_run_query_in_parallel; +my_bool opt_mts_slave_local_timestamp; +my_bool opt_mts_slave_run_query_in_parallel; ulong opt_mts_partition_hash_soft_max; ulonglong opt_mts_pending_jobs_size_max; ulong opt_mts_coordinator_basic_nap; === modified file 'sql/mysqld.h' --- a/sql/mysqld.h 2010-12-10 12:10:20 +0000 +++ b/sql/mysqld.h 2010-12-14 08:57:16 +0000 @@ -174,10 +174,10 @@ extern my_bool allow_slave_start; extern LEX_CSTRING reason_slave_blocked; extern ulong slave_trans_retries; extern uint slave_net_timeout; -extern ulong opt_slave_parallel_workers; +extern ulong opt_mts_slave_parallel_workers; extern ulong opt_mts_slave_worker_queue_len_max; -extern my_bool slave_local_timestamp_opt; -extern my_bool opt_slave_run_query_in_parallel; +extern my_bool opt_mts_slave_local_timestamp; +extern my_bool opt_mts_slave_run_query_in_parallel; extern ulong opt_mts_partition_hash_soft_max; extern ulonglong opt_mts_pending_jobs_size_max; extern ulong opt_mts_coordinator_basic_nap; === modified file 'sql/rpl_rli_pdb.cc' --- a/sql/rpl_rli_pdb.cc 2010-12-11 19:00:47 +0000 +++ b/sql/rpl_rli_pdb.cc 2010-12-14 08:57:16 +0000 @@ -643,7 +643,7 @@ ulong circular_buffer_queue::en_queue(vo // store ret= a; - set_dynamic(&Q, (uchar*) item, ret= a); + set_dynamic(&Q, (uchar*) item, a); // pre-boundary cond === modified file 'sql/rpl_slave.cc' --- a/sql/rpl_slave.cc 2010-12-11 19:00:47 +0000 +++ b/sql/rpl_slave.cc 2010-12-14 08:57:16 +0000 @@ -4178,7 +4178,7 @@ int slave_start_workers(Relay_log_info * rli->mts_slave_worker_queue_len_max= ::opt_mts_slave_worker_queue_len_max; rli->gaq= new Slave_committed_queue(rli->get_group_master_log_name(), sizeof(Slave_job_group), - rli->slave_parallel_workers * + 1 + rli->slave_parallel_workers * rli->mts_slave_worker_queue_len_max, n); rli->mts_pending_jobs_size= 0; rli->mts_pending_jobs_size_max= ::opt_mts_pending_jobs_size_max; @@ -4188,7 +4188,7 @@ int slave_start_workers(Relay_log_info * rli->mts_worker_underrun_level= ::opt_mts_worker_underrun_level; rli->mts_total_groups= 0; rli->curr_group_seen_begin= 0; - rli->run_query_in_parallel= opt_slave_run_query_in_parallel; + rli->run_query_in_parallel= opt_mts_slave_run_query_in_parallel; rli->checkpoint_seqno= 0; for (i= 0; i < n; i++) @@ -6389,7 +6389,7 @@ int start_slave(THD* thd , Master_info* To cache the system var value and used it in the following. The system var can change but not the cached. */ - mi->rli->slave_parallel_workers= opt_slave_parallel_workers; + mi->rli->slave_parallel_workers= opt_mts_slave_parallel_workers; mysql_mutex_lock(&mi->rli->data_lock); === modified file 'sql/sys_vars.cc' --- a/sql/sys_vars.cc 2010-12-11 19:00:47 +0000 +++ b/sql/sys_vars.cc 2010-12-14 08:57:16 +0000 @@ -3134,9 +3134,9 @@ static Sys_var_ulong Sys_slave_trans_ret VALID_RANGE(0, ULONG_MAX), DEFAULT(10), BLOCK_SIZE(1)); static Sys_var_ulong Sys_slave_parallel_workers( - "slave_parallel_workers", + "mts_slave_parallel_workers", "Number of worker threads for executing events in parallel ", - GLOBAL_VAR(opt_slave_parallel_workers), CMD_LINE(REQUIRED_ARG), + GLOBAL_VAR(opt_mts_slave_parallel_workers), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1)); static Sys_var_ulong Sys_mts_slave_worker_queue_len_max( "mts_slave_worker_queue_len_max", @@ -3146,17 +3146,17 @@ static Sys_var_ulong Sys_mts_slave_worke "mts_pending_jobs_size_max. Whichever limit is reached Coordinator thread" "suspends further jobs assigning until conditions have been improved.", GLOBAL_VAR(opt_mts_slave_worker_queue_len_max), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, ULONG_MAX - 1), DEFAULT(40000), BLOCK_SIZE(1)); + VALID_RANGE(1, ULONG_MAX - 1), DEFAULT(40000), BLOCK_SIZE(1)); static Sys_var_mybool Sys_slave_local_timestamp( - "slave_local_timestamp", "if enabled slave computes the event appying " + "mts_exp_slave_local_timestamp", "If enabled slave itself computes the event appying " "time value to implicitly affected timestamp columms. Otherwise (default) " - "installs prescribed by the master value", - GLOBAL_VAR(slave_local_timestamp_opt), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); + "it installs prescribed by the master value", + GLOBAL_VAR(opt_mts_slave_local_timestamp), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); static Sys_var_mybool Sys_slave_run_query_in_parallel( - "slave_run_query_in_parallel", + "mts_exp_slave_run_query_in_parallel", "The default not an actual database name is used as partition info " "for parallel execution of Query_log_event ", - GLOBAL_VAR(opt_slave_run_query_in_parallel), CMD_LINE(OPT_ARG), + GLOBAL_VAR(opt_mts_slave_run_query_in_parallel), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); static Sys_var_ulong Sys_mts_partition_hash_soft_max( "mts_partition_hash_soft_max", @@ -3173,13 +3173,13 @@ static Sys_var_ulonglong Sys_mts_pending VALID_RANGE(1024, (ulonglong)~(intptr)0), DEFAULT(16 * 1024*1024), BLOCK_SIZE(1024), ON_CHECK(0)); static Sys_var_ulong Sys_mts_coordinator_basic_nap( - "opt_mts_coordinator_basic_nap", + "mts_coordinator_basic_nap", "Time in msec to sleep by MTS Coordinator to avoid the Worker queues " "room overrun", GLOBAL_VAR(opt_mts_coordinator_basic_nap), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, ULONG_MAX), DEFAULT(5), BLOCK_SIZE(1)); static Sys_var_ulong Sys_mts_worker_underrun_level( - "opt_mts_worker_underrun_level", + "mts_worker_underrun_level", "percent of Worker queue size at which Worker is considered to become " "hungry", GLOBAL_VAR(opt_mts_worker_underrun_level), CMD_LINE(REQUIRED_ARG), --===============2100085083== 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: acf8c9c59870caf17f1097d726b8f7344dadfbc8 # timestamp: 2010-12-14 10:57:29 +0200 # base_revision_id: andrei.elkin@stripped\ # qytl1wzuhics2q8b # # Begin bundle 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 eCu7DjkJjYTJ0jMcC/4u5IpwoSAjuDse --===============2100085083==--