bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3264)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-cluster/ based on revid:magnus.blaudd@strippedwfg

 3264 Magnus Blåudd	2011-03-28
      ndb
       - fix .result file 
       - each statement is binlogged within it's own BEGIN/COMMIT block
        in binlog_format=STATEMENT mode
       - New warning printed when "unsafe statements" are binlogged. For example
         when updating transactional and nontranscational tables.

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result	2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result	2011-03-28 15:05:07 +0000
@@ -10,15 +10,21 @@ UPDATE t1, t2 SET m = 2, b = 3 WHERE n =
 START TRANSACTION;
 INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2);
 UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f;
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as transactional or temporary table, and writes to any of them.
 UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c;
 COMMIT;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1,1), (1,2), (2,1), (2,2)
+mysqld-bin.000001	#	Query	#	#	COMMIT
 mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t2 VALUES (1,1), (1,2), (2,1), (2,2)
 mysqld-bin.000001	#	Query	#	#	COMMIT
+mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1, t2 SET m = 2, b = 3 WHERE n = c
+mysqld-bin.000001	#	Query	#	#	COMMIT
 mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2)
 mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f

Attachment: [text/bzr-bundle] bzr/[e-mail]