bk commit into 5.1 tree (tomas:1.1939)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1939 05/10/31 22:15:18 tomas@stripped +1 -0
  merge

  mysql-test/r/user_var-binlog.result
    1.9 05/10/31 22:15:11 tomas@stripped +1 -1
    merge

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl1012-5.0

--- 1.8/mysql-test/r/user_var-binlog.result	2005-10-31 10:39:12 +01:00
+++ 1.9/mysql-test/r/user_var-binlog.result	2005-10-31 22:15:11 +01:00
@@ -11,7 +11,7 @@
 master-bin.000001	#	User var	1	#	@`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
 master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES(@`a b`)
 master-bin.000001	#	User var	1	#	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
-master-bin.000001	#	User var	1	#	@`var2`=_latin1 0x61 COLLATE binary
+master-bin.000001	#	User var	1	#	@`var2`=_binary 0x61 COLLATE binary
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (@var1),(@var2)
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;