From: Andrei Elkin Date: June 24 2011 9:39am Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3319 to 3320) WL#5569 List-Archive: http://lists.mysql.com/commits/139810 Message-Id: <201106240939.p5O9dHPA030066@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1573427922==" --===============1573427922== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3320 Andrei Elkin 2011-06-24 wl#5569 MTS this patch completes the previous one to fixes a result file and make the innodb specific test verification to base on tables not views. modified: mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test mysql-test/suite/rpl/r/rpl_sequential.result 3319 Andrei Elkin 2011-06-24 wl#5569 MTS this is an exploratory patch to sort out if verification method what was based on views has its own not related to mts flaw. The patch calls verification macro on the tables that required some adjustment. modified: mysql-test/extra/rpl_tests/rpl_parallel_load.test mysql-test/suite/rpl/r/rpl_parallel.result === 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-17 15:34:16 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test 2011-06-24 09:38:34 +0000 @@ -299,12 +299,27 @@ eval select time_to_sec(@m_1) - time_to_ time_to_sec(@s_m1) - time_to_sec(@s_m0) as 'delta_sm' into outfile '$delta_file'; +# +# Consistency verification +# let $i = $databases + 1; while($i) { let $i1 = $i; dec $i1; + # removing uuid() non-deterministic last collumn with statement format + connection master; + + --disable_query_log + if (`select @@global.binlog_format like 'statement'`) + { + eval alter table test$i1.ti_nk drop c; + eval alter table test$i1.ti_wk drop c; + } + --disable_query_log + + sync_slave_with_master; let $diff_tables=master:test$i1.v_ti_nk, slave:test$i1.v_ti_nk; source include/diff_tables.inc; === modified file 'mysql-test/suite/rpl/r/rpl_sequential.result' --- a/mysql-test/suite/rpl/r/rpl_sequential.result 2011-06-20 13:26:35 +0000 +++ b/mysql-test/suite/rpl/r/rpl_sequential.result 2011-06-24 09:38:34 +0000 @@ -15,68 +15,68 @@ select ts from test0.benchmark where sta select ts from test0.benchmark where state like 'slave takes on load' into @s_0; 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.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] +include/diff_tables.inc [master:test15.tm_nk, slave:test15.tm_nk] +include/diff_tables.inc [master:test15.ti_nk, slave:test15.ti_nk] +include/diff_tables.inc [master:test15.tm_wk, slave:test15.tm_wk] +include/diff_tables.inc [master:test15.ti_wk, slave:test15.ti_wk] +include/diff_tables.inc [master:test14.tm_nk, slave:test14.tm_nk] +include/diff_tables.inc [master:test14.ti_nk, slave:test14.ti_nk] +include/diff_tables.inc [master:test14.tm_wk, slave:test14.tm_wk] +include/diff_tables.inc [master:test14.ti_wk, slave:test14.ti_wk] +include/diff_tables.inc [master:test13.tm_nk, slave:test13.tm_nk] +include/diff_tables.inc [master:test13.ti_nk, slave:test13.ti_nk] +include/diff_tables.inc [master:test13.tm_wk, slave:test13.tm_wk] +include/diff_tables.inc [master:test13.ti_wk, slave:test13.ti_wk] +include/diff_tables.inc [master:test12.tm_nk, slave:test12.tm_nk] +include/diff_tables.inc [master:test12.ti_nk, slave:test12.ti_nk] +include/diff_tables.inc [master:test12.tm_wk, slave:test12.tm_wk] +include/diff_tables.inc [master:test12.ti_wk, slave:test12.ti_wk] +include/diff_tables.inc [master:test11.tm_nk, slave:test11.tm_nk] +include/diff_tables.inc [master:test11.ti_nk, slave:test11.ti_nk] +include/diff_tables.inc [master:test11.tm_wk, slave:test11.tm_wk] +include/diff_tables.inc [master:test11.ti_wk, slave:test11.ti_wk] +include/diff_tables.inc [master:test10.tm_nk, slave:test10.tm_nk] +include/diff_tables.inc [master:test10.ti_nk, slave:test10.ti_nk] +include/diff_tables.inc [master:test10.tm_wk, slave:test10.tm_wk] +include/diff_tables.inc [master:test10.ti_wk, slave:test10.ti_wk] +include/diff_tables.inc [master:test9.tm_nk, slave:test9.tm_nk] +include/diff_tables.inc [master:test9.ti_nk, slave:test9.ti_nk] +include/diff_tables.inc [master:test9.tm_wk, slave:test9.tm_wk] +include/diff_tables.inc [master:test9.ti_wk, slave:test9.ti_wk] +include/diff_tables.inc [master:test8.tm_nk, slave:test8.tm_nk] +include/diff_tables.inc [master:test8.ti_nk, slave:test8.ti_nk] +include/diff_tables.inc [master:test8.tm_wk, slave:test8.tm_wk] +include/diff_tables.inc [master:test8.ti_wk, slave:test8.ti_wk] +include/diff_tables.inc [master:test7.tm_nk, slave:test7.tm_nk] +include/diff_tables.inc [master:test7.ti_nk, slave:test7.ti_nk] +include/diff_tables.inc [master:test7.tm_wk, slave:test7.tm_wk] +include/diff_tables.inc [master:test7.ti_wk, slave:test7.ti_wk] +include/diff_tables.inc [master:test6.tm_nk, slave:test6.tm_nk] +include/diff_tables.inc [master:test6.ti_nk, slave:test6.ti_nk] +include/diff_tables.inc [master:test6.tm_wk, slave:test6.tm_wk] +include/diff_tables.inc [master:test6.ti_wk, slave:test6.ti_wk] +include/diff_tables.inc [master:test5.tm_nk, slave:test5.tm_nk] +include/diff_tables.inc [master:test5.ti_nk, slave:test5.ti_nk] +include/diff_tables.inc [master:test5.tm_wk, slave:test5.tm_wk] +include/diff_tables.inc [master:test5.ti_wk, slave:test5.ti_wk] +include/diff_tables.inc [master:test4.tm_nk, slave:test4.tm_nk] +include/diff_tables.inc [master:test4.ti_nk, slave:test4.ti_nk] +include/diff_tables.inc [master:test4.tm_wk, slave:test4.tm_wk] +include/diff_tables.inc [master:test4.ti_wk, slave:test4.ti_wk] +include/diff_tables.inc [master:test3.tm_nk, slave:test3.tm_nk] +include/diff_tables.inc [master:test3.ti_nk, slave:test3.ti_nk] +include/diff_tables.inc [master:test3.tm_wk, slave:test3.tm_wk] +include/diff_tables.inc [master:test3.ti_wk, slave:test3.ti_wk] +include/diff_tables.inc [master:test2.tm_nk, slave:test2.tm_nk] +include/diff_tables.inc [master:test2.ti_nk, slave:test2.ti_nk] +include/diff_tables.inc [master:test2.tm_wk, slave:test2.tm_wk] +include/diff_tables.inc [master:test2.ti_wk, slave:test2.ti_wk] +include/diff_tables.inc [master:test1.tm_nk, slave:test1.tm_nk] +include/diff_tables.inc [master:test1.ti_nk, slave:test1.ti_nk] +include/diff_tables.inc [master:test1.tm_wk, slave:test1.tm_wk] +include/diff_tables.inc [master:test1.ti_wk, slave:test1.ti_wk] +include/diff_tables.inc [master:test0.tm_nk, slave:test0.tm_nk] +include/diff_tables.inc [master:test0.ti_nk, slave:test0.ti_nk] +include/diff_tables.inc [master:test0.tm_wk, slave:test0.tm_wk] +include/diff_tables.inc [master:test0.ti_wk, slave:test0.ti_wk] include/rpl_end.inc --===============1573427922== 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: 59a86fbf4f81f00c872ca73002f901344d13bde6 # timestamp: 2011-06-24 12:39:17 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@stripped\ # veul7s4zy8pucf2r # # Begin bundle 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 QNbXK0w= --===============1573427922==--