bzr commit into mysql-6.0-bugteam branch (mats:3041)

[Mats Kindahl]

#At file:///home/bzr/bugs/b36763-mysql-6.0-bugteam/ based on revid:mats@stripped

 3041 Mats Kindahl	2009-02-10 [merge]
      Merging with 6.0-bugteam
modified:
  mysql-test/r/mysqlbinlog_row_trans.result
  mysql-test/suite/binlog/r/binlog_truncate_myisam.result
  mysql-test/suite/binlog/t/binlog_truncate_innodb.test
  mysql-test/suite/binlog/t/binlog_truncate_myisam.test

=== modified file 'mysql-test/r/mysqlbinlog_row_trans.result'
--- a/mysql-test/r/mysqlbinlog_row_trans.result	2008-09-06 04:49:43 +0000
+++ b/mysql-test/r/mysqlbinlog_row_trans.result	2009-02-10 21:26:37 +0000
@@ -215,30 +215,14 @@ COMMIT/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
-BEGIN
-/*!*/;
-# at #
-#010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Xid = #
-COMMIT/*!*/;
-# at #
-#010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=1000000000/*!*/;
-BEGIN
-/*!*/;
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Xid = #
-COMMIT/*!*/;
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
 BEGIN
@@ -347,17 +331,9 @@ COMMIT/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
-BEGIN
-/*!*/;
-# at #
-#010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Xid = #
-COMMIT/*!*/;
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t2
@@ -473,17 +449,9 @@ ROLLBACK
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
-BEGIN
-/*!*/;
-# at #
-#010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t1
 /*!*/;
 # at #
-#010909  4:46:40 server id 1  end_log_pos # 	Xid = #
-COMMIT/*!*/;
-# at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
 TRUNCATE TABLE t2

=== modified file 'mysql-test/suite/binlog/r/binlog_truncate_myisam.result'
--- a/mysql-test/suite/binlog/r/binlog_truncate_myisam.result	2009-02-06 16:06:41 +0000
+++ b/mysql-test/suite/binlog/r/binlog_truncate_myisam.result	2009-02-10 21:26:37 +0000
@@ -1,3 +1,4 @@
+RESET MASTER;
 CREATE TABLE t1 (a INT) ENGINE=MyISAM;
 CREATE TABLE t2 (a INT) ENGINE=MyISAM;
 INSERT INTO t2 VALUES (1),(2),(3);

=== modified file 'mysql-test/suite/binlog/t/binlog_truncate_innodb.test'
--- a/mysql-test/suite/binlog/t/binlog_truncate_innodb.test	2009-02-06 16:06:41 +0000
+++ b/mysql-test/suite/binlog/t/binlog_truncate_innodb.test	2009-02-10 21:26:37 +0000
@@ -1,6 +1,13 @@
 source include/have_log_bin.inc;
 source include/have_innodb.inc;
 
+# It is necessary to reset the master since otherwise the binlog test
+# might show the wrong binary log. The default for SHOW BINLOG EVENTS
+# is to show the first binary log, not the current one (which is
+# actually a better idea).
+
+RESET MASTER;
+
 let $engine = InnoDB;
 source extra/binlog_tests/binlog_truncate.test;
 

=== modified file 'mysql-test/suite/binlog/t/binlog_truncate_myisam.test'
--- a/mysql-test/suite/binlog/t/binlog_truncate_myisam.test	2009-02-06 16:06:41 +0000
+++ b/mysql-test/suite/binlog/t/binlog_truncate_myisam.test	2009-02-10 21:26:37 +0000
@@ -1,4 +1,11 @@
 source include/have_log_bin.inc;
 
+# It is necessary to reset the master since otherwise the binlog test
+# might show the wrong binary log. The default for SHOW BINLOG EVENTS
+# is to show the first binary log, not the current one (which is
+# actually a better idea).
+
+RESET MASTER;
+
 let $engine = MyISAM;
 source extra/binlog_tests/binlog_truncate.test;