bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3298 to 3299) WL#5569

[Andrei Elkin]

 3299 Andrei Elkin	2011-06-16
      wl#5569 MTS
      
      fixing slave_parallel_workers_basic and rpl_stop_middle_group which cant run in MTS

    modified:
      mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
      sql/sys_vars.cc
 3298 Andrei Elkin	2011-06-16
      wl#5569 MTS
      
      adding new tests to sys_vars.\

    added:
      mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result
      mysql-test/suite/sys_vars/r/slave_pending_jobs_size_max_basic.result
      mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test
      mysql-test/suite/sys_vars/t/slave_pending_jobs_size_max_basic.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_stop_middle_group.test'
--- a/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test	2011-03-29 13:44:23 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test	2011-06-16 16:46:22 +0000
@@ -5,6 +5,10 @@
 # The matter of testing correlates to some of `rpl_start_stop_slave' that does
 # not require `have_debug'.
 
+# Test group sematics and thereby failing in such group is bound to 
+# the Single-Threaded Slave. 
+-- source include/not_mts_slave_parallel_workers.inc
+
 connection master;
 
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2011-06-15 17:12:11 +0000
+++ b/sql/sys_vars.cc	2011-06-16 16:46:22 +0000
@@ -3353,7 +3353,7 @@ static Sys_var_ulong Sys_slave_parallel_
        "slave_parallel_workers",
        "Number of worker threads for executing events in parallel ",
        GLOBAL_VAR(opt_mts_slave_parallel_workers), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
+       VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1));
 
 static Sys_var_ulonglong Sys_mts_pending_jobs_size_max(
        "slave_pending_jobs_size_max",


Attachment: [text/bzr-bundle] bzr/[e-mail]