From: Andrei Elkin
Date: April 5 2011 4:26pm
Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3274) WL#5569
List-Archive: http://lists.mysql.com/commits/134875
Message-Id: <201104051626.p35GQnQa008043@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1614473506=="

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

 3274 Andrei Elkin	2011-04-05
      wl#5569 MTS
      
      restoring previous 4 default workers that rpl_parallel works with.

    modified:
      mysql-test/extra/rpl_tests/rpl_parallel_load.test
      mysql-test/suite/rpl/r/rpl_parallel.result
      mysql-test/suite/rpl/t/rpl_parallel-slave.opt
=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load.test'
--- a/mysql-test/extra/rpl_tests/rpl_parallel_load.test	2011-04-03 10:07:30 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_parallel_load.test	2011-04-05 16:26:37 +0000
@@ -260,26 +260,26 @@ select time_to_sec(@m_1) - time_to_sec(@
        time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s' into outfile 'delta.out';
 
 
-# let $i = $databases + 1;
-# while($i)
-# {
-#   let $i1 = $i;
-#   dec $i1;
-
-#   let $diff_tables=master:test$i1.v_tm_nk, slave:test$i1.v_tm_nk;
-#   source include/diff_tables.inc;
-
-#   let $diff_tables=master:test$i1.v_ti_nk, slave:test$i1.v_ti_nk;
-#   source include/diff_tables.inc;
+let $i = $databases + 1;
+while($i)
+{
+  let $i1 = $i;
+  dec $i1;
 
-#   let $diff_tables=master:test$i1.v_tm_wk, slave:test$i1.v_tm_wk;
-#   source include/diff_tables.inc;
+  let $diff_tables=master:test$i1.v_tm_nk, slave:test$i1.v_tm_nk;
+  source include/diff_tables.inc;
 
-#   let $diff_tables=master:test$i1.v_ti_wk, slave:test$i1.v_ti_wk;
-#   source include/diff_tables.inc;
+  let $diff_tables=master:test$i1.v_ti_nk, slave:test$i1.v_ti_nk;
+  source include/diff_tables.inc;
 
-#   dec $i;
-# }
+  let $diff_tables=master:test$i1.v_tm_wk, slave:test$i1.v_tm_wk;
+  source include/diff_tables.inc;
+
+  let $diff_tables=master:test$i1.v_ti_wk, slave:test$i1.v_ti_wk;
+  source include/diff_tables.inc;
+
+  dec $i;
+}
 --enable_result_log
 --enable_query_log
 

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel.result	2011-04-03 10:07:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel.result	2011-04-05 16:26:37 +0000
@@ -12,5 +12,69 @@ select ts from test0.benchmark where sta
 select ts from test0.benchmark where state like 'slave ends load' into @s_1;
 select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta_m', 
 time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s' into outfile 'delta.out';
+include/diff_tables.inc [master:test15.v_tm_nk, slave:test15.v_tm_nk]
+include/diff_tables.inc [master:test15.v_ti_nk, slave:test15.v_ti_nk]
+include/diff_tables.inc [master:test15.v_tm_wk, slave:test15.v_tm_wk]
+include/diff_tables.inc [master:test15.v_ti_wk, slave:test15.v_ti_wk]
+include/diff_tables.inc [master:test14.v_tm_nk, slave:test14.v_tm_nk]
+include/diff_tables.inc [master:test14.v_ti_nk, slave:test14.v_ti_nk]
+include/diff_tables.inc [master:test14.v_tm_wk, slave:test14.v_tm_wk]
+include/diff_tables.inc [master:test14.v_ti_wk, slave:test14.v_ti_wk]
+include/diff_tables.inc [master:test13.v_tm_nk, slave:test13.v_tm_nk]
+include/diff_tables.inc [master:test13.v_ti_nk, slave:test13.v_ti_nk]
+include/diff_tables.inc [master:test13.v_tm_wk, slave:test13.v_tm_wk]
+include/diff_tables.inc [master:test13.v_ti_wk, slave:test13.v_ti_wk]
+include/diff_tables.inc [master:test12.v_tm_nk, slave:test12.v_tm_nk]
+include/diff_tables.inc [master:test12.v_ti_nk, slave:test12.v_ti_nk]
+include/diff_tables.inc [master:test12.v_tm_wk, slave:test12.v_tm_wk]
+include/diff_tables.inc [master:test12.v_ti_wk, slave:test12.v_ti_wk]
+include/diff_tables.inc [master:test11.v_tm_nk, slave:test11.v_tm_nk]
+include/diff_tables.inc [master:test11.v_ti_nk, slave:test11.v_ti_nk]
+include/diff_tables.inc [master:test11.v_tm_wk, slave:test11.v_tm_wk]
+include/diff_tables.inc [master:test11.v_ti_wk, slave:test11.v_ti_wk]
+include/diff_tables.inc [master:test10.v_tm_nk, slave:test10.v_tm_nk]
+include/diff_tables.inc [master:test10.v_ti_nk, slave:test10.v_ti_nk]
+include/diff_tables.inc [master:test10.v_tm_wk, slave:test10.v_tm_wk]
+include/diff_tables.inc [master:test10.v_ti_wk, slave:test10.v_ti_wk]
+include/diff_tables.inc [master:test9.v_tm_nk, slave:test9.v_tm_nk]
+include/diff_tables.inc [master:test9.v_ti_nk, slave:test9.v_ti_nk]
+include/diff_tables.inc [master:test9.v_tm_wk, slave:test9.v_tm_wk]
+include/diff_tables.inc [master:test9.v_ti_wk, slave:test9.v_ti_wk]
+include/diff_tables.inc [master:test8.v_tm_nk, slave:test8.v_tm_nk]
+include/diff_tables.inc [master:test8.v_ti_nk, slave:test8.v_ti_nk]
+include/diff_tables.inc [master:test8.v_tm_wk, slave:test8.v_tm_wk]
+include/diff_tables.inc [master:test8.v_ti_wk, slave:test8.v_ti_wk]
+include/diff_tables.inc [master:test7.v_tm_nk, slave:test7.v_tm_nk]
+include/diff_tables.inc [master:test7.v_ti_nk, slave:test7.v_ti_nk]
+include/diff_tables.inc [master:test7.v_tm_wk, slave:test7.v_tm_wk]
+include/diff_tables.inc [master:test7.v_ti_wk, slave:test7.v_ti_wk]
+include/diff_tables.inc [master:test6.v_tm_nk, slave:test6.v_tm_nk]
+include/diff_tables.inc [master:test6.v_ti_nk, slave:test6.v_ti_nk]
+include/diff_tables.inc [master:test6.v_tm_wk, slave:test6.v_tm_wk]
+include/diff_tables.inc [master:test6.v_ti_wk, slave:test6.v_ti_wk]
+include/diff_tables.inc [master:test5.v_tm_nk, slave:test5.v_tm_nk]
+include/diff_tables.inc [master:test5.v_ti_nk, slave:test5.v_ti_nk]
+include/diff_tables.inc [master:test5.v_tm_wk, slave:test5.v_tm_wk]
+include/diff_tables.inc [master:test5.v_ti_wk, slave:test5.v_ti_wk]
+include/diff_tables.inc [master:test4.v_tm_nk, slave:test4.v_tm_nk]
+include/diff_tables.inc [master:test4.v_ti_nk, slave:test4.v_ti_nk]
+include/diff_tables.inc [master:test4.v_tm_wk, slave:test4.v_tm_wk]
+include/diff_tables.inc [master:test4.v_ti_wk, slave:test4.v_ti_wk]
+include/diff_tables.inc [master:test3.v_tm_nk, slave:test3.v_tm_nk]
+include/diff_tables.inc [master:test3.v_ti_nk, slave:test3.v_ti_nk]
+include/diff_tables.inc [master:test3.v_tm_wk, slave:test3.v_tm_wk]
+include/diff_tables.inc [master:test3.v_ti_wk, slave:test3.v_ti_wk]
+include/diff_tables.inc [master:test2.v_tm_nk, slave:test2.v_tm_nk]
+include/diff_tables.inc [master:test2.v_ti_nk, slave:test2.v_ti_nk]
+include/diff_tables.inc [master:test2.v_tm_wk, slave:test2.v_tm_wk]
+include/diff_tables.inc [master:test2.v_ti_wk, slave:test2.v_ti_wk]
+include/diff_tables.inc [master:test1.v_tm_nk, slave:test1.v_tm_nk]
+include/diff_tables.inc [master:test1.v_ti_nk, slave:test1.v_ti_nk]
+include/diff_tables.inc [master:test1.v_tm_wk, slave:test1.v_tm_wk]
+include/diff_tables.inc [master:test1.v_ti_wk, slave:test1.v_ti_wk]
+include/diff_tables.inc [master:test0.v_tm_nk, slave:test0.v_tm_nk]
+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_parallel-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_parallel-slave.opt	2011-04-03 10:07:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel-slave.opt	2011-04-05 16:26:37 +0000
@@ -1,2 +1 @@
---log-warnings=0 --slave-transaction-retries=0
-
+--mts-slave-parallel-workers=4 --log-warnings=0 --slave-transaction-retries=0


--===============1614473506==
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: 260a0284a1884fc24805b3f6895d33c50a4baa2e
# timestamp: 2011-04-05 19:26:49 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: andrei.elkin@stripped\
#   ptvutwjgxdtgy38z
# 
# Begin bundle
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


--===============1614473506==--