Automerge: local bug branch --> mysql-5.1-rep+3 latest.

Luis Soares · Luis Soares · commit 1c50342c4fdf · 2010-01-19T23:18:37.000Z
diff --git a/mysql-test/suite/binlog/r/binlog_stm_user_variables.result b/mysql-test/suite/binlog/r/binlog_stm_user_variables.result
@@ -1,3 +1,4 @@
+RESET MASTER;
 SET @positive= 18446744073709551615;
 SET @negative= -9223372036854775808;
 CREATE TABLE t1 (`tinyint` TINYINT,
diff --git a/mysql-test/suite/binlog/t/binlog_stm_user_variables.test b/mysql-test/suite/binlog/t/binlog_stm_user_variables.test
@@ -1,4 +1,5 @@
 -- source include/have_binlog_format_statement.inc
+RESET MASTER;
 #
 # BUG#49562: SBR out of sync when using numeric data types + user variable
 #

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+RESET MASTER;`
`1`	`2`	`SET @positive= 18446744073709551615;`
`2`	`3`	`SET @negative= -9223372036854775808;`
`3`	`4`	CREATE TABLE t1 (`tinyint` TINYINT,
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`-- source include/have_binlog_format_statement.inc`
	`2`	`+RESET MASTER;`
`2`	`3`	`#`
`3`	`4`	`# BUG#49562: SBR out of sync when using numeric data types + user variable`
`4`	`5`	`#`