bk commit into 5.1 tree (mkindahl:1.2551)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl 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-18 15:16:39+01:00, mkindahl@stripped +3 -0
  Updating result files.

  mysql-test/r/multi_update.result@stripped, 2008-02-18 15:16:22+01:00,
mkindahl@stripped +2 -2
    Result change.

  mysql-test/r/rpl_bug33931.result@stripped, 2008-02-18 15:16:28+01:00,
mkindahl@stripped +5 -0
    Result change.

  mysql-test/suite/ndb/r/ndb_binlog_format.result@stripped, 2008-02-18 15:16:28+01:00,
mkindahl@stripped +0 -2
    Result change.

diff -Nrup a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result
--- a/mysql-test/r/multi_update.result	2008-02-15 17:48:44 +01:00
+++ b/mysql-test/r/multi_update.result	2008-02-18 15:16:22 +01:00
@@ -627,7 +627,7 @@ a	b
 4	4
 show master status /* there must be the UPDATE query event */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	336		
+master-bin.000001	197		
 delete from t1;
 delete from t2;
 insert into t1 values (1,2),(3,4),(4,4);
@@ -637,7 +637,7 @@ UPDATE t2,t1  SET t2.a=t2.b where t2.a=t
 ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
 show master status /* there must be the UPDATE query event */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	351		
+master-bin.000001	212		
 drop table t1, t2;
 set @@session.binlog_format= @sav_binlog_format;
 drop table if exists t1, t2, t3;
diff -Nrup a/mysql-test/r/rpl_bug33931.result b/mysql-test/r/rpl_bug33931.result
--- a/mysql-test/r/rpl_bug33931.result	2008-02-13 13:09:40 +01:00
+++ b/mysql-test/r/rpl_bug33931.result	2008-02-18 15:16:28 +01:00
@@ -36,3 +36,8 @@ Master_SSL_Cert	
 Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
diff -Nrup a/mysql-test/suite/ndb/r/ndb_binlog_format.result
b/mysql-test/suite/ndb/r/ndb_binlog_format.result
--- a/mysql-test/suite/ndb/r/ndb_binlog_format.result	2007-12-14 14:40:43 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_binlog_format.result	2008-02-18 15:16:28 +01:00
@@ -18,9 +18,7 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t2 VALUES (1,1), (1,2), (2,1),
(2,2)
 master-bin.000001	#	Query	#	#	use `test`; COMMIT
-master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t1, t2 SET m = 2, b = 3 WHERE n = c
-master-bin.000001	#	Query	#	#	use `test`; COMMIT
 master-bin.000001	#	Query	#	#	use `test`; BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t3 VALUES (1,1), (1,2), (2,1),
(2,2)
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f