bk commit into 5.1 tree (tomas:1.2525)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas.  When tomas does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-13 20:52:01+01:00, tomas@stripped +4 -0
  correction of merge

  mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test@stripped, 2008-02-13 20:51:55+01:00, tomas@stripped +17 -4
    correction of merge

  mysql-test/mysql-test-run.pl@stripped, 2008-02-13 20:51:55+01:00, tomas@stripped +6 -3
    correction of merge

  mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result@stripped, 2008-02-13 20:51:56+01:00, tomas@stripped +2 -6
    correction of merge

  mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result@stripped, 2008-02-13 20:51:56+01:00, tomas@stripped +16 -2
    correction of merge

diff -Nrup a/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test b/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test
--- a/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test	2007-06-21 21:53:45 +02:00
+++ b/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test	2008-02-13 20:51:55 +01:00
@@ -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 <start_pos>
+--echo
 --replace_result $start_pos <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 <start_pos>
+--replace_column 5 #
+--eval show binlog events from $start_pos limit 1,1
+
+--echo
+--echo # and the COMMIT should be at <end_pos>
 --echo
 --replace_result $start_pos <start_pos> $end_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 -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-02-12 11:17:24 +01:00
+++ b/mysql-test/mysql-test-run.pl	2008-02-13 20:51:55 +01:00
@@ -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 -Nrup a/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result b/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
--- a/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result	2008-01-04 16:49:36 +01:00
+++ b/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result	2008-02-13 20:51:56 +01:00
@@ -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 -Nrup a/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result b/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
--- a/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result	2008-01-04 15:29:21 +01:00
+++ b/mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result	2008-02-13 20:51:56 +01:00
@@ -20,13 +20,27 @@ from mysql.ndb_apply_status;
 @log_name:=log_name	@start_pos:=start_pos	@end_pos:=end_pos
 <log_name>	<start_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 <start_pos>
+
 show binlog events from <start_pos> limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	<start_pos>	Query	1	#	use `test`; insert into t1 values (1,2)
+master-bin.000001	<start_pos>	Query	1	#	use `test`; BEGIN
+
+# Now the insert, one step after
 
 show binlog events from <start_pos> 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 <end_pos>
+
+show binlog events from <start_pos> limit 2,1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Xid	1	<end_pos>	COMMIT /* XID */
 
 begin;
 insert into t1 values (2,3);