From: Andrei Elkin
Date: June 15 2011 5:41pm
Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3292 to 3293) WL#5569
List-Archive: http://lists.mysql.com/commits/139265
Message-Id: <201106151741.p5FHfwFS008596@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1634065275=="

--===============1634065275==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3293 Andrei Elkin	2011-06-15
      wl#5569 MTS
      
      correcting --slave-parallel-workers in few more files

    modified:
      mysql-test/include/not_mts_slave_parallel_workers.inc
      mysql-test/suite/rpl/r/rpl_sequential.result
      mysql-test/suite/rpl/t/rpl_sequential.test
 3292 Andrei Elkin	2011-06-15
      wl#5569 MTS
      
      correcting --slave-parallel-workers in collections/default.push

    modified:
      mysql-test/collections/default.push
=== modified file 'mysql-test/include/not_mts_slave_parallel_workers.inc'
--- a/mysql-test/include/not_mts_slave_parallel_workers.inc	2010-12-22 15:01:47 +0000
+++ b/mysql-test/include/not_mts_slave_parallel_workers.inc	2011-06-15 17:41:33 +0000
@@ -1,4 +1,4 @@
-if (`SELECT @@GLOBAL.mts_slave_parallel_workers != 0`)
+if (`SELECT @@GLOBAL.slave_parallel_workers != 0`)
 {
      skip Test cannot run with MTS;
 }

=== modified file 'mysql-test/suite/rpl/r/rpl_sequential.result'
--- a/mysql-test/suite/rpl/r/rpl_sequential.result	2011-04-06 12:51:58 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sequential.result	2011-06-15 17:41:33 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 [connection master]
 set @save.mts_slave_parallel_workers= 0;
-select @@global.mts_slave_parallel_workers as 'zero';
+select @@global.slave_parallel_workers as 'zero';
 zero
 0
 call mtr.add_suppression('Slave: Error dropping database');
@@ -80,5 +80,4 @@ include/diff_tables.inc [master:test0.v_
 include/diff_tables.inc [master:test0.v_ti_nk, slave:test0.v_ti_nk]
 include/diff_tables.inc [master:test0.v_tm_wk, slave:test0.v_tm_wk]
 include/diff_tables.inc [master:test0.v_ti_wk, slave:test0.v_ti_wk]
-set @@global.mts_exp_slave_local_timestamp= @save.mts_exp_slave_local_timestamp;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_sequential.test'
--- a/mysql-test/suite/rpl/t/rpl_sequential.test	2010-12-27 18:54:41 +0000
+++ b/mysql-test/suite/rpl/t/rpl_sequential.test	2011-06-15 17:41:33 +0000
@@ -11,7 +11,7 @@
 connection slave;
 
 set @save.mts_slave_parallel_workers= 0;
-select @@global.mts_slave_parallel_workers as 'zero';
+select @@global.slave_parallel_workers as 'zero';
 
 connection master;
 


--===============1634065275==
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: a11f4ab755bb3f1def8a16400d93868030b24b0b
# timestamp: 2011-06-15 20:41:58 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: andrei.elkin@stripped\
#   vd74iewkwu3infic
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcWJAP4AAoRfgAAQeOP//3qG
jAD////wUAV5e7kG0267XatVOhXUJKTQmJqemmU8jEyTTammgGg9IyZAJKE0aNMmhMSPUyI9IAAA
GgCRIEJNHqaam009KY0RoeoekPUaGmgHMAmAEwAAmAAJgACSQQAAp6CaZMTJqaA0GhoHqcxdr1DX
d9tDNHNLn9Ewm5X4ZgGwNVXK5zJlrRKJH5W+PDQvidIxttHj2fQONryqXjNEQQ+SriHIa46wg8cR
BqyD3sGH78Pfky5MQtOYlJ5qMo5Hx6bVBk250QZJeriwPTa71J4lgSlQA8lx79OqbAE1yo9agsz9
Oyvst0jBAYHJJb2L6MRosZwUFUI5sTGUYwWnISIR0yOyU9g6TmhSHj2mgKIpRXs4iii4sPWarIWe
K4Zg6sAzjDfUS59Jl5Er7CXCLFbRQOxk8aq88ZUENPyiRoTTS/9YPwQr57UBqNQYI14Hwxf26GSw
WRhqy8R+5QwMRySJVuPNBYvaoBlbe6FRU8weKourGHoDt798OudzW6E33YAqQrDmMXE7qhFZYYm5
wvLQ4RjPmaGQ4qLtllXTNjN63IhIQ+nF5CRlvUWvsHLk5qtGFAnXaW7SUvJrhHugXwjYSIXcIlo5
HXI19p58EZXNJWZFnHsde2JQSImWeO168zwuLJiUjOV5CCmvdPIqUpZnETweflRXEoNpKWEJqDV4
Z9AryuW8zCli0GQF6Z+Oeu6mVGXQHzmZGo678aZKXOJn56Bn2a6nQIP1FZfNllJLfiG/UTYRKrjm
+YRfSU2qyNE4kXXmVBkXJG181nQzIlocrqOt8BQhDq5hcKtnbgce8OGzqXFuXLA2piKMF4RL5VJC
kqqopExMYM5/Y3dhjx8X+Tr+/DlzljWoGJpi7t3hIkKYppkI7fOoHstsN9TaUy7/d8xpeRz9p7vR
AUlkTrlFKoKlOMp+I6KWazdAOZ4gxOfjpPCAaTarEtsUOYyE9BnIyo4m49ND1pwxnRX+D3iO3cXn
mbzAyYYhdaRyDcQLrB+d1j52ZAO/CAqo0z6ZLJkferOjqcciZwKrTPHsyR3qSH3xfsQSYXHVnyXt
C7eQgELeEqvrmaCOspz1DlmEjrNBMdFouXZq1NmoCwE86SmVmTVOmLmeNo8A2YWaz62Yubg8ERqS
UAaDKnEOlVM7UUNL0W2x1QCZEggisYpUSQtJDYszgMbgbqIYfEJvFxOHArXRck+ErrhsmNQ5O92B
XeymtqVgj3NeviMxAcNMk6VyAuMBDh2QzLSmxn6pNHyU+ITCIGitmSXGdwtigf87MrshMKRmYVRd
POItfVN5dbEHeIqaFhQ2QrQ1ABoFy8NoQHbaQGCFwo64ZssAGCKUvBXIBhQJkOgTCG+0Uk41Mi3E
ZWKei+7yANTkugwWWJtyttrUPbdrVe+k1gpnU1CSd6i9peMJKEkEM8twEfL4m7UgmZDKzDaLI3hE
etI+D9IgzkE1wRJw8RHRAbha+CLFSuEVoCxN/LZ+K2U7KdpgwbYJkWThViIf2d8kQiwiSsPgI1G6
qL1IkjhFK/MhRsAGIoPJV+GAaakWX0oeyY1Q0wR1nY246LKwnuaxxGGAYBqtk8TMLl67oyampRdH
KhZsSPM02C2hWBQKA5O535HHBhjT+58wsqT3J4mro3MxorluJlI3RONDDl6xFBVg4r7k9Fu47uKx
138yeao8zdS8I29yyStU4jYKIUBiz9Ooatbt0xmuqvrAzqkwjwoF2MJ45XB4HbGz/i7kinChIYsS
Afw=


--===============1634065275==--