From: Andrei Elkin Date: December 15 2010 11:42am Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3246) List-Archive: http://lists.mysql.com/commits/126921 Message-Id: <201012151142.oBFBgJDC024456@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1313084078==" --===============1313084078== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3246 Andrei Elkin 2010-12-14 [merge] merge from wl5569 repo added: mysql-test/suite/sys_vars/r/mts_checkpoint_period_basic.result mysql-test/suite/sys_vars/t/mts_checkpoint_period_basic.test modified: mysql-test/extra/rpl_tests/rpl_crash_safe.inc mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.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 mysql-test/suite/rpl/t/rpl_mixed_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_row_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_stm_crash_safe-slave.opt mysql-test/suite/sys_vars/r/all_vars.result scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh sql/lock.cc sql/mysqld.cc sql/mysqld.h sql/rpl_info.cc sql/rpl_info.h sql/rpl_info_factory.cc sql/rpl_info_table.cc sql/rpl_info_table.h sql/rpl_info_table_access.cc sql/rpl_rli.cc sql/rpl_slave.cc sql/sql_parse.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 21:16:31 +0000 +++ b/mysql-test/r/mysqld--help-notwin.result 2010-12-14 14:46:20 +0000 @@ -346,6 +346,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 @@ -353,6 +363,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 @@ -361,6 +373,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=# @@ -415,12 +430,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 @@ -661,18 +670,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 @@ -896,9 +896,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 @@ -918,8 +923,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 @@ -983,10 +986,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-13 21:16:31 +0000 +++ b/sql/mysqld.cc 2010-12-14 14:46:20 +0000 @@ -464,10 +464,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-13 21:16:31 +0000 +++ b/sql/mysqld.h 2010-12-14 14:46:20 +0000 @@ -177,10 +177,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-14 12:51:30 +0000 +++ b/sql/rpl_slave.cc 2010-12-14 14:46:20 +0000 @@ -4121,7 +4121,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; @@ -4131,7 +4131,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++) @@ -6332,7 +6332,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), --===============1313084078== 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: 977d491597d276b7e9e95543f5fd6abf87551423 # timestamp: 2010-12-15 13:42:19 +0200 # base_revision_id: alfranio.correia@stripped\ # lw14vs6tcnzj9gdi # # Begin bundle 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 bXeSAA== --===============1313084078==--