From: Andrei Elkin
Date: June 16 2011 4:46pm
Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3299) WL#5569
List-Archive: http://lists.mysql.com/commits/139358
Message-Id: <201106161646.p5GGkS3F002063@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1330998142=="

--===============1330998142==
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

 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
=== 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",


--===============1330998142==
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: 21965e6f31c3bb967a9ff53eb5c9089f365ec1a1
# timestamp: 2011-06-16 19:46:28 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: andrei.elkin@stripped\
#   0r264wlpvghhj1hv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXS8txwAAhhfgAgQWGf//3+v
n1C////wUAT4vZ2rWt1sjrR0bcDJI1T1PaaTJNpDaZNokMRoGjRoGhk2kBKSaTE2EKeNTTU09INA
NAAAAACUICE0001PTQ1R5T1BozU0NA0GYo0Gg5gTE0GEyZMmRhME00yMTAEMAkoTIAEYU2ptU9pM
jU9TE9SBkYJk0zTRvfny69MmODz4nr1YPWoZL9efDICaRdUqXa7YuaqzUw+d5zFgqqqpw+wd741r
mcVxYywVnwaeJK530wxjl7zt8JHFnZ6KeEvzefpUIyfHzziFkiO3BKM13G+Zy5b0HKgUjZ7+Ar5p
IvnIVcjMZyIiXhuH4QWSLxc4IpwShL8Dsdj9k2ueHkRCXoEnabCueCnK3pFvQbQDj0j3ITmDRpDM
CbilvUXzS0R5ul5gqenRkMYEylw0aTYmcCxjMD1ILQ8tfz2nW5BMFMTQ6m6xBLTbSSnzR0R54Oeu
eiUMR1JkL3QXqRIgOSGma4wkYNGmSL6SQnmLgLxuSAiPCegBxbiR6tVCheZQUo+ZFVkQ6FWzMYkg
1Hk+MqR9CRFMbkVlKipk6SF0lcK3vpcGcsK3FDaXJjmnnGBliZYkBixzG7c6TErPLuOAFa9gEdBt
WzErclES/aezYJc8piNmc4R9A+aW7qoZlmUkymJrwTgHzAWF5AygAxYw0kLZwpCdjKTMjZCaOcZe
tMco59g9oLKjGQvXhQwYOxI6NYonjDQo1MfVJv8wNDYY1toFWwtwjKHrMxMpIiLbYSj7tilc4QS2
wSvM+UFjNkeMCxV6TQjJZb8N6dNtSr0GkPIUo8hnWCbd2vbTGxECIEuaNytmzfBtXBbbv+bbcr/7
CH8s38VWA64qd7ln+1onZ4ffdcHiUYVDtBuwcQ5dkAd7ENGtPV4sgLl4rp0KIz+GQeVPEqio/o6V
vR/Pzaay8qcZiOwdpQK36bn8LpASXQBroOb0vDVONTwd6uebEM8KxWLvty8dVGknFgNbRWEmbGGB
jwmj+i7XcSBUCICVLCVkV1BOQTV8Bhq45Emq0kCeMLXQRHksRwW20s7Q3pgSpKHz6Ac+w2s4sAJL
Cwi0Kiou/5/ZcffvORm/vYNsFBEhv1sgate73XSMv7pUllLVgyjyaWHES4So5FBlK2QttmpMFYXc
spEqQwHIWpGhvyZzbvIVFxZy5nabucFGTvLlh4HpJxndC6I5n2miLBctE6vElGD8gFAM7UrPVWYH
YDPfIwwoSUFTYVXX3SkOAU9SZgcHF+9gwS4Naivj4c//39cML0TZo1WRFGC4utA0AzwNxF3k0/WR
0JLJDZjaG51KIRBxQw6ojtOywSabgYSDN3wlEsnHrpVcnXP6xLWppTOkuC/CTCONS7JMXupS1aDq
UYRF2DbqmUiyHycIkaiiAL16+ksncKNgMDVp9gL48ElBHR0AZ5iTUbSVdjl6tcZ4sDhiFTSSAbMT
raMCCi0lRHsmuAjk0VeBIBY3qAsUXVK+B0TT0PJbUgaXV7o+KSelZwwT8ZkVcqYragXeLEXHEYlo
VYxZY2kWBFDLh4WTSSKFSSiWMhQ6GgwdSUFFZkQgFSDRaNVehVzuc4ueEx7V9XkyZAZTmZOqx5nA
plcgUJs0RLm2FhBmVxWZ6sjItDZUI1ZrUZrihT0wRyClDQGchfauu7NoR4oBsNLx6JotRYFV5B5V
JtCi1qMwP8XckU4UJB0vLccA


--===============1330998142==--