List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:June 24 2011 9:38am
Subject:bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3320) 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

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


Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20110624093834-4ywfitmakbxpp3z7.bundle
Thread
bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3320) WL#5569Andrei Elkin25 Jun