From: Andrei Elkin Date: June 28 2011 8:30am Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3326) WL#5569 List-Archive: http://lists.mysql.com/commits/139945 Message-Id: <201106280830.p5S8UWE4001525@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0302658598==" --===============0302658598== 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 3326 Andrei Elkin 2011-06-28 wl#5569 MTS replacing views with regular tables for consistency verification in rpl_parallel_innodb. Also a minor cleanup in rpl_parallel is done. modified: mysql-test/extra/rpl_tests/rpl_parallel_load.test mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test mysql-test/suite/rpl/r/rpl_parallel_innodb.result === modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load.test' --- a/mysql-test/extra/rpl_tests/rpl_parallel_load.test 2011-06-23 21:11:22 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_parallel_load.test 2011-06-28 08:30:18 +0000 @@ -30,48 +30,6 @@ connection master; --disable_query_log --disable_result_log -use test; -delimiter |; -create procedure one_session(k int) -begin - while k > 0 do - insert into tm_nk values(k, 0); - insert into tm_wk values(null, 0); - insert into ti_nk values(k, 0); - insert into ti_wk values(null, 0); - set k = k - 1; - end while; -end| -delimiter ;| - -## let $i = $workers + 1; -##eval -# delimiter |; -# create procedure p1(i int) -# begin -# while i > 0 -# ##while ($i) -# ##{ -# ## let $i1=$i; -# ## dec $i1; -# ## use test$i1; -# ## call on_session(); -# ## dec $i; -# ##} -# use test0; -# call one_session(); -# use test1; -# call one_session(); -# use test2; -# call one_session(); -# use test3; -# call one_session(); -# i= i-1; -# end while; -# end| -# delimiter ;| - - let $i = $databases + 1; while($i) { @@ -85,22 +43,6 @@ while($i) create table ti_nk (a int, b int, c text) engine=innodb; create table ti_wk (a int auto_increment primary key, b int, c text) engine=innodb; - if (`select @@global.binlog_format like 'statement'`) - { - create view v_tm_nk as select a,b from tm_nk; - create view v_tm_wk as select a,b from tm_wk; - create view v_ti_nk as select a,b from ti_nk; - create view v_ti_wk as select a,b from ti_wk; - } - - if (`select @@global.binlog_format not like 'statement'`) - { - create view v_tm_nk as select a,b,c from tm_nk; - create view v_tm_wk as select a,b,c from tm_wk; - create view v_ti_nk as select a,b,c from ti_nk; - create view v_ti_wk as select a,b,c from ti_wk; - } - # this table is special - just for timing. It's more special on test0 db # where it contains master timing of the load as well. create table benchmark (state text) engine=myisam; # timestamp keep on the slave side @@ -329,9 +271,6 @@ while($i) dec $i; } -use test; -drop procedure one_session; - --enable_result_log --enable_query_log === modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test' --- a/mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test 2011-06-24 09:38:34 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test 2011-06-28 08:30:18 +0000 @@ -28,7 +28,7 @@ let $del_trans_wk= 1; disable_query_log; if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as "TRUE"`) { - let $iter = 100; + let $iter = 10; } enable_query_log; @@ -63,18 +63,6 @@ while($i) eval insert into ti_nk values($l1, $i1, uuid()); dec $l1; } - - if (`select @@global.binlog_format like 'statement'`) - { - create view v_ti_nk as select a,b from ti_nk; - create view v_ti_wk as select a,b from ti_wk; - } - - if (`select @@global.binlog_format not like 'statement'`) - { - create view v_ti_nk as select a,b,c from ti_nk; - create view v_ti_wk as select a,b,c from ti_wk; - } # this table is special - just for timing. It's more special on test0 db # where it contains master timing of the load as well. @@ -320,10 +308,10 @@ while($i) --disable_query_log sync_slave_with_master; - let $diff_tables=master:test$i1.v_ti_nk, slave:test$i1.v_ti_nk; + let $diff_tables=master:test$i1.ti_nk, slave:test$i1.ti_nk; source include/diff_tables.inc; - let $diff_tables=master:test$i1.v_ti_wk, slave:test$i1.v_ti_wk; + let $diff_tables=master:test$i1.ti_wk, slave:test$i1.ti_wk; source include/diff_tables.inc; dec $i; === modified file 'mysql-test/suite/rpl/r/rpl_parallel_innodb.result' --- a/mysql-test/suite/rpl/r/rpl_parallel_innodb.result 2011-06-17 15:34:16 +0000 +++ b/mysql-test/suite/rpl/r/rpl_parallel_innodb.result 2011-06-28 08:30:18 +0000 @@ -15,36 +15,36 @@ select ts from test0.benchmark where sta select ts from test0.benchmark where state like 'slave ends load' into @s_1; select ts from test0.benchmark where state like 'slave is processing load' into @s_0; select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta.out'; -include/diff_tables.inc [master:test15.v_ti_nk, slave:test15.v_ti_nk] -include/diff_tables.inc [master:test15.v_ti_wk, slave:test15.v_ti_wk] -include/diff_tables.inc [master:test14.v_ti_nk, slave:test14.v_ti_nk] -include/diff_tables.inc [master:test14.v_ti_wk, slave:test14.v_ti_wk] -include/diff_tables.inc [master:test13.v_ti_nk, slave:test13.v_ti_nk] -include/diff_tables.inc [master:test13.v_ti_wk, slave:test13.v_ti_wk] -include/diff_tables.inc [master:test12.v_ti_nk, slave:test12.v_ti_nk] -include/diff_tables.inc [master:test12.v_ti_wk, slave:test12.v_ti_wk] -include/diff_tables.inc [master:test11.v_ti_nk, slave:test11.v_ti_nk] -include/diff_tables.inc [master:test11.v_ti_wk, slave:test11.v_ti_wk] -include/diff_tables.inc [master:test10.v_ti_nk, slave:test10.v_ti_nk] -include/diff_tables.inc [master:test10.v_ti_wk, slave:test10.v_ti_wk] -include/diff_tables.inc [master:test9.v_ti_nk, slave:test9.v_ti_nk] -include/diff_tables.inc [master:test9.v_ti_wk, slave:test9.v_ti_wk] -include/diff_tables.inc [master:test8.v_ti_nk, slave:test8.v_ti_nk] -include/diff_tables.inc [master:test8.v_ti_wk, slave:test8.v_ti_wk] -include/diff_tables.inc [master:test7.v_ti_nk, slave:test7.v_ti_nk] -include/diff_tables.inc [master:test7.v_ti_wk, slave:test7.v_ti_wk] -include/diff_tables.inc [master:test6.v_ti_nk, slave:test6.v_ti_nk] -include/diff_tables.inc [master:test6.v_ti_wk, slave:test6.v_ti_wk] -include/diff_tables.inc [master:test5.v_ti_nk, slave:test5.v_ti_nk] -include/diff_tables.inc [master:test5.v_ti_wk, slave:test5.v_ti_wk] -include/diff_tables.inc [master:test4.v_ti_nk, slave:test4.v_ti_nk] -include/diff_tables.inc [master:test4.v_ti_wk, slave:test4.v_ti_wk] -include/diff_tables.inc [master:test3.v_ti_nk, slave:test3.v_ti_nk] -include/diff_tables.inc [master:test3.v_ti_wk, slave:test3.v_ti_wk] -include/diff_tables.inc [master:test2.v_ti_nk, slave:test2.v_ti_nk] -include/diff_tables.inc [master:test2.v_ti_wk, slave:test2.v_ti_wk] -include/diff_tables.inc [master:test1.v_ti_nk, slave:test1.v_ti_nk] -include/diff_tables.inc [master:test1.v_ti_wk, slave:test1.v_ti_wk] -include/diff_tables.inc [master:test0.v_ti_nk, slave:test0.v_ti_nk] -include/diff_tables.inc [master:test0.v_ti_wk, slave:test0.v_ti_wk] +include/diff_tables.inc [master:test15.ti_nk, slave:test15.ti_nk] +include/diff_tables.inc [master:test15.ti_wk, slave:test15.ti_wk] +include/diff_tables.inc [master:test14.ti_nk, slave:test14.ti_nk] +include/diff_tables.inc [master:test14.ti_wk, slave:test14.ti_wk] +include/diff_tables.inc [master:test13.ti_nk, slave:test13.ti_nk] +include/diff_tables.inc [master:test13.ti_wk, slave:test13.ti_wk] +include/diff_tables.inc [master:test12.ti_nk, slave:test12.ti_nk] +include/diff_tables.inc [master:test12.ti_wk, slave:test12.ti_wk] +include/diff_tables.inc [master:test11.ti_nk, slave:test11.ti_nk] +include/diff_tables.inc [master:test11.ti_wk, slave:test11.ti_wk] +include/diff_tables.inc [master:test10.ti_nk, slave:test10.ti_nk] +include/diff_tables.inc [master:test10.ti_wk, slave:test10.ti_wk] +include/diff_tables.inc [master:test9.ti_nk, slave:test9.ti_nk] +include/diff_tables.inc [master:test9.ti_wk, slave:test9.ti_wk] +include/diff_tables.inc [master:test8.ti_nk, slave:test8.ti_nk] +include/diff_tables.inc [master:test8.ti_wk, slave:test8.ti_wk] +include/diff_tables.inc [master:test7.ti_nk, slave:test7.ti_nk] +include/diff_tables.inc [master:test7.ti_wk, slave:test7.ti_wk] +include/diff_tables.inc [master:test6.ti_nk, slave:test6.ti_nk] +include/diff_tables.inc [master:test6.ti_wk, slave:test6.ti_wk] +include/diff_tables.inc [master:test5.ti_nk, slave:test5.ti_nk] +include/diff_tables.inc [master:test5.ti_wk, slave:test5.ti_wk] +include/diff_tables.inc [master:test4.ti_nk, slave:test4.ti_nk] +include/diff_tables.inc [master:test4.ti_wk, slave:test4.ti_wk] +include/diff_tables.inc [master:test3.ti_nk, slave:test3.ti_nk] +include/diff_tables.inc [master:test3.ti_wk, slave:test3.ti_wk] +include/diff_tables.inc [master:test2.ti_nk, slave:test2.ti_nk] +include/diff_tables.inc [master:test2.ti_wk, slave:test2.ti_wk] +include/diff_tables.inc [master:test1.ti_nk, slave:test1.ti_nk] +include/diff_tables.inc [master:test1.ti_wk, slave:test1.ti_wk] +include/diff_tables.inc [master:test0.ti_nk, slave:test0.ti_nk] +include/diff_tables.inc [master:test0.ti_wk, slave:test0.ti_wk] include/rpl_end.inc --===============0302658598== 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: f0dfcc0f5e20b20f31367b54a105cd343c2a3065 # timestamp: 2011-06-28 11:30:32 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@stripped\ # dynwl2o5rr8iynhe # # Begin bundle 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 mIGu/xdyRThQkFcKz/s= --===============0302658598==--