Merge bk-internal:/home/bk/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint

mysql-test/r/binlog_stm_ps.result

+drop table if exists t1;
+reset master;
+create table t1 (a int);
+prepare s from "insert into t1 values (@a),(?)";
+set @a=98;
+execute s using @a;
+prepare s from "insert into t1 values (?)";
+set @a=99;
+execute s using @a;
+prepare s from "insert into t1 select 100 limit ?";
+set @a=100;
+execute s using @a;
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
+master-bin.000001	#	User var	#	#	@`a`=98
+master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (@a),(98)
+master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (99)
+master-bin.000001	#	Query	#	#	use `test`; insert into t1 select 100 limit 100
+drop table t1;

mysql-test/r/rpl_user_variables.result

@@ -224,31 +224,6 @@ k
 100
 42
 drop table t1, t2;
-reset master;
-create table t1 (a int);
-prepare s from "insert into t1 values (@a),(?)";
-set @a=98;
-execute s using @a;
-prepare s from "insert into t1 values (?)";
-set @a=99;
-execute s using @a;
-prepare s from "insert into t1 select 100 limit ?";
-set @a=100;
-execute s using @a;
-show binlog events limit 1,100;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	106	Query	1	192	use `test`; create table t1 (a int)
-slave-bin.000001	192	User var	2	234	@`a`=98
-slave-bin.000001	234	Query	1	328	use `test`; insert into t1 values (@a),(98)
-slave-bin.000001	328	Query	1	417	use `test`; insert into t1 values (99)
-slave-bin.000001	417	Query	1	515	use `test`; insert into t1 select 100 limit 100
-select * from t1;
-a
-98
-98
-99
-100
-drop table t1;
 create table t1(a int, b int);
 prepare s1 from 'insert into t1 values (@x:=@x+1, ?)';
 set @x=1;

mysql-test/t/binlog_stm_ps.test

+# This test is to verify replication with PS
+
+-- source include/have_binlog_format_mixed_or_statement.inc
+
+-- disable_query_log
+reset master; # get rid of previous tests binlog
+-- enable_query_log
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+reset master;
+
+#
+# Bug #26842: master binary log contains invalid queries - replication fails
+#
+create table t1 (a int); 
+prepare s from "insert into t1 values (@a),(?)";
+set @a=98; execute s using @a;
+prepare s from "insert into t1 values (?)";
+set @a=99; execute s using @a;
+prepare s from "insert into t1 select 100 limit ?";
+set @a=100; execute s using @a;
+source include/show_binlog_events.inc;
+drop table t1;

mysql-test/t/rpl_user_variables.test

@@ -292,31 +292,6 @@ SELECT * from t2;
 connection master;
 drop table t1, t2;
 
-#
-# Bug #26842: master binary log contains invalid queries - replication fails
-#
-save_master_pos;
-connection slave;
-sync_with_master;
-reset master;
-
-connection master;
-create table t1 (a int); 
-prepare s from "insert into t1 values (@a),(?)";
-set @a=98; execute s using @a;
-prepare s from "insert into t1 values (?)";
-set @a=99; execute s using @a;
-prepare s from "insert into t1 select 100 limit ?";
-set @a=100; execute s using @a;
-
-save_master_pos;
-connection slave;
-sync_with_master;
-show binlog events limit 1,100;
-select * from t1;
-connection master;
-drop table t1;
-
 #
 # Bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements
 #