bk commit into 5.0 tree (aelkin:1.2120) BUG#19136

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of elkin. When elkin 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.2120 06/05/07 19:54:57 aelkin@stripped +1 -0
  Bug#19136: Crashing log-bin and uninitialized user variables in a derived table
  
  recalculating results

  mysql-test/r/rpl_user_variables.result
    1.16 06/05/07 19:54:51 aelkin@stripped +1 -0
    fixing results

# 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:	aelkin
# Host:	dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root:	/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0-bug19136

--- 1.15/mysql-test/r/rpl_user_variables.result	2006-05-07 16:02:51 +03:00
+++ 1.16/mysql-test/r/rpl_user_variables.result	2006-05-07 19:54:51 +03:00
@@ -106,5 +106,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)
+insert into t1 select * FROM (select @var1 union  select @var2) AS t2;
 drop table t1;
 stop slave;