From: Date: May 25 2007 2:24pm
Subject: bk commit into 5.1 tree (ramil:1.2508) BUG#26842
List-Archive: http://lists.mysql.com/commits/27340
X-Bug: 26842
Message-Id: <20070525122450.79F463400070@ramil.myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.1 repository of ram. When ram 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, 2007-05-25 17:24:45+05:00, ramil@stripped +4 -0
  Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row.

  mysql-test/r/binlog_stm_ps.result@stripped, 2007-05-25 17:24:43+05:00, ramil@stripped +20 -0
    New BitKeeper file ``mysql-test/r/binlog_stm_ps.result''

  mysql-test/r/binlog_stm_ps.result@stripped, 2007-05-25 17:24:43+05:00, ramil@stripped +0 -0

  mysql-test/r/rpl_user_variables.result@stripped, 2007-05-25 17:24:43+05:00, ramil@stripped +0 -25
    Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row.

  mysql-test/t/binlog_stm_ps.test@stripped, 2007-05-25 17:24:43+05:00, ramil@stripped +25 -0
    New BitKeeper file ``mysql-test/t/binlog_stm_ps.test''
    

  mysql-test/t/binlog_stm_ps.test@stripped, 2007-05-25 17:24:43+05:00, ramil@stripped +0 -0

  mysql-test/t/rpl_user_variables.test@stripped, 2007-05-25 17:24:43+05:00, ramil@stripped +0 -25
    Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	ramil.myoffice.izhnet.ru
# Root:	/home/ram/work/mysql-5.1-maint

--- 1.24/mysql-test/r/rpl_user_variables.result	2007-05-25 17:24:50 +05:00
+++ 1.25/mysql-test/r/rpl_user_variables.result	2007-05-25 17:24:50 +05:00
@@ -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;

--- 1.23/mysql-test/t/rpl_user_variables.test	2007-05-25 17:24:50 +05:00
+++ 1.24/mysql-test/t/rpl_user_variables.test	2007-05-25 17:24:50 +05:00
@@ -293,31 +293,6 @@ 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
 #
 connection master;
--- New file ---
+++ mysql-test/r/binlog_stm_ps.result	07/05/25 17:24:43
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;

--- New file ---
+++ mysql-test/t/binlog_stm_ps.test	07/05/25 17:24:43
# 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;