List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:April 5 2011 4:26pm
Subject:bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3274) 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

 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


Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20110405162637-gb1imln4g448ixef.bundle
Thread
bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3274) WL#5569Andrei Elkin6 Apr
  • Re: bzr commit into mysql-next-mr-wl5569 branch(andrei.elkin:3274) WL#5569Bjorn Munch7 Apr