From 2c9578375d7d17aee2ea45ef10fd27ff99d26c64 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Feb 2008 20:52:01 +0100 Subject: [PATCH] correction of merge --- .../extra/rpl_tests/rpl_ndb_apply_status.test | 21 +++++++++++++++---- mysql-test/mysql-test-run.pl | 9 +++++--- .../ndb_team/r/rpl_ndb_extraColMaster.result | 8 ++----- .../ndb_team/r/rpl_ndb_mix_innodb.result | 18 ++++++++++++++-- 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test b/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test index 926c4106d6d..b9abf022804 100644 --- a/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test +++ b/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test @@ -50,17 +50,30 @@ insert into t1 values (1,2); --echo connection master; -# here is actually a bug, since there is no begin statement, the -# query is autocommitted, and end_pos shows end of the insert and not -# end of the commit +--echo # Now check that that is in the apply_status table is consistant +--echo # with what is in the binlog +--echo +--echo # since insert is done with transactional engine, expect a BEGIN +--echo # at +--echo --replace_result $start_pos --replace_column 5 # --eval show binlog events from $start_pos limit 1 + +--echo +--echo # Now the insert, one step after +--echo +--replace_result $start_pos +--replace_column 5 # +--eval show binlog events from $start_pos limit 1,1 + +--echo +--echo # and the COMMIT should be at --echo --replace_result $start_pos $end_pos --replace_column 2 # --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ ---eval show binlog events from $start_pos limit 1,1 +--eval show binlog events from $start_pos limit 2,1 --echo diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7f4312130c2..eeef9b22506 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -136,9 +136,12 @@ our $opt_suites; our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run our @extra_suites= ( - ["mysql-5.1-new-ndb", "ndb_team"], - ["mysql-5.1-telco-6.2", "ndb_team"], - ["mysql-5.1-telco-6.3", "ndb_team"], + ["mysql-5.1-new-ndb", "ndb_team"], + ["mysql-5.1-new-ndb-merge", "ndb_team"], + ["mysql-5.1-telco-6.2", "ndb_team"], + ["mysql-5.1-telco-6.2-merge", "ndb_team"], + ["mysql-5.1-telco-6.3", "ndb_team"], + ["mysql-6.0-ndb", "ndb_team"], ); diff --git a/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result b/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result index 3baf6afd56e..97300e7131b 100644 --- a/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result +++ b/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result @@ -454,9 +454,7 @@ f1 f2 f3 f4 update t31 set f5=555555555555555 where f3=6; update t31 set f2=2 where f3=2; update t31 set f1=NULL where f3=1; -update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; -Warnings: -Warning 1048 Column 'f3' cannot be null +update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3; ** Delete from Master ** @@ -1595,9 +1593,7 @@ f1 f2 f3 f4 update t31 set f5=555555555555555 where f3=6; update t31 set f2=2 where f3=2; update t31 set f1=NULL where f3=1; -update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; -Warnings: -Warning 1048 Column 'f3' cannot be null +update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3; ** Delete from Master ** diff --git a/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result b/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result index 625d06de44b..36f77a17e62 100644 --- a/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result +++ b/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result @@ -20,13 +20,27 @@ from mysql.ndb_apply_status; @log_name:=log_name @start_pos:=start_pos @end_pos:=end_pos +# Now check that that is in the apply_status table is consistant +# with what is in the binlog + +# since insert is done with transactional engine, expect a BEGIN +# at + show binlog events from limit 1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 Query 1 # use `test`; insert into t1 values (1,2) +master-bin.000001 Query 1 # use `test`; BEGIN + +# Now the insert, one step after show binlog events from limit 1,1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Xid 1 445 COMMIT /* XID */ +master-bin.000001 397 Query 1 # use `test`; insert into t1 values (1,2) + +# and the COMMIT should be at + +show binlog events from limit 2,1; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 # Xid 1 COMMIT /* XID */ begin; insert into t1 values (2,3);