From e529fdc5eed0dda5de4048c6d636b1f05f28783d Mon Sep 17 00:00:00 2001
From: "holyfoot@deer.(none)" <>
Date: Thu, 3 Nov 2005 16:17:11 +0400
Subject: [PATCH] Merging

---
 mysql-test/r/ctype_cp932_binlog.result | 12 +++++-------
 mysql-test/t/ctype_cp932_binlog.test   |  3 +--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/mysql-test/r/ctype_cp932_binlog.result b/mysql-test/r/ctype_cp932_binlog.result
index 89f0ae71f4f..d04fce7738c 100644
--- a/mysql-test/r/ctype_cp932_binlog.result
+++ b/mysql-test/r/ctype_cp932_binlog.result
@@ -6,13 +6,11 @@ CREATE TABLE t1(f1 blob);
 PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
 SET @var1= x'8300';
 EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 79;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
-master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
-master-bin.000001	#	User var	1	#	@`var1`=_binary 0x8300 COLLATE binary
-master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES(@'var1')
+SHOW BINLOG EVENTS FROM 98;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	98	Query	1	185	use `test`; CREATE TABLE t1(f1 blob)
+master-bin.000001	185	User var	1	224	@`var1`=_binary 0x8300 COLLATE binary
+master-bin.000001	224	Query	1	317	use `test`; INSERT INTO t1 VALUES(@'var1')
 SELECT HEX(f1) FROM t1;
 HEX(f1)
 8300
diff --git a/mysql-test/t/ctype_cp932_binlog.test b/mysql-test/t/ctype_cp932_binlog.test
index e8ec0d46caf..270e27cf27f 100644
--- a/mysql-test/t/ctype_cp932_binlog.test
+++ b/mysql-test/t/ctype_cp932_binlog.test
@@ -26,8 +26,7 @@ SET @var1= x'8300';
 # code (and I have used it to test the fix) until there is some way to
 # exercise this code from mysql-test-run.
 EXECUTE stmt1 USING @var1;
---replace_column 2 # 5 #
-SHOW BINLOG EVENTS FROM 79;
+SHOW BINLOG EVENTS FROM 98;
 SELECT HEX(f1) FROM t1;
 DROP table t1;
 # end test for bug#11338