List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:December 14 2010 8:57am
Subject:bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3245) WL#5569
View as plain text  
#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),


Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20101214085716-gsajrf9l0lmkd5xk.bundle
Thread
bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3245) WL#5569Andrei Elkin14 Dec