Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1

mysql-test/r/ctype_cp932.result

@@ -8576,16 +8576,19 @@ FC4B
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
+RESET MASTER;
 CREATE TABLE t1(f1 blob);
 PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
 SET @var1= x'8300';
 EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 27642;
+SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	27642	Query	1	27642	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	27701	Query	1	27701	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=95,COLLATION_CONNECTION=95,COLLATION_DATABASE=95,COLLATION_SERVER=8
-master-bin.000001	27837	User var	1	27837	@`var1`=_binary 0x8300 COLLATE binary
-master-bin.000001	27876	Query	1	27876	use `test`; INSERT INTO t1 VALUES(@'var1')
+master-bin.000001	#	Start	1	#	Server ver: 4.1.15-debug-log, Binlog ver: 3
+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')
 SELECT HEX(f1) FROM t1;
 HEX(f1)
 8300

mysql-test/t/ctype_cp932.test

@@ -403,6 +403,7 @@ DROP TABLE t3;
 
 # Test prepared statement with 0x8300 sequence in parameter while
 # running with cp932 client character set.
+RESET MASTER;
 CREATE TABLE t1(f1 blob);
 PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
 SET @var1= x'8300';
@@ -417,7 +418,8 @@ 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;
-SHOW BINLOG EVENTS FROM 27642;
+--replace_column 2 # 5 #
+SHOW BINLOG EVENTS;
 SELECT HEX(f1) FROM t1;
 DROP table t1;
 # end test for bug#11338