bk commit into 5.1 tree (msvensson:1.2386)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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
  1.2386 06/05/11 09:30:29 msvensson@neptunus.(none) +2 -0
  After merge fixes

  mysql-test/t/rpl_user_variables.test
    1.18 06/05/11 09:30:24 msvensson@neptunus.(none) +1 -1
    After merge fixes

  mysql-test/r/rpl_user_variables.result
    1.19 06/05/11 09:30:24 msvensson@neptunus.(none) +3 -3
    After merge fixes

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1

--- 1.18/mysql-test/r/rpl_user_variables.result	2006-05-11 08:58:57 +02:00
+++ 1.19/mysql-test/r/rpl_user_variables.result	2006-05-11 09:30:24 +02:00
@@ -76,7 +76,9 @@
 abc'def
 abcn1
 abcn1n2
-show binlog events from 98;
+abc\def
+This is a test
+show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Query	1	#	use `test`; create table t1(n char(30))
 slave-bin.000001	#	User var	2	#	@`i1`=12345678901234
@@ -106,8 +108,6 @@
 slave-bin.000001	#	Query	1	#	use `test`; insert into t1 values (@a),(@a)
 slave-bin.000001	#	User var	2	#	@`a`=NULL
 slave-bin.000001	#	Query	1	#	use `test`; insert into t1 values (@a),(@a),(@a*5)
-abc\def
-This is a test
 insert into t1 select * FROM (select @var1 union  select @var2) AS t2;
 drop table t1;
 stop slave;

--- 1.17/mysql-test/t/rpl_user_variables.test	2006-05-11 08:58:57 +02:00
+++ 1.18/mysql-test/t/rpl_user_variables.test	2006-05-11 09:30:24 +02:00
@@ -55,7 +55,7 @@
 sync_slave_with_master;
 SELECT * FROM t1 ORDER BY n;
 --replace_column 2 # 5 #
-show binlog events from 98;
+show binlog events from 102;
 #
 # BUG19136: Crashing log-bin and uninitialized user variables in a derived table
 # just to check nothing bad happens anymore