Add test that got dropped in automerge

mysql-test/r/ctype_cp932.result:
  Fix wrong auto-merge
mysql-test/t/ctype_cp932.test:
  Fix wrong automerge.

mysql-test/r/ctype_cp932.result

@@ -11315,6 +11315,21 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
+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;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	98	Server ver: 5.0.12-beta-debug-log, Binlog ver: 4
+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
+DROP table t1;
 SET collation_connection='cp932_japanese_ci';
 create table t1 select repeat('a',4000) a;
 delete from t1;

mysql-test/t/ctype_cp932.test

@@ -398,6 +398,27 @@ DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
 
+# 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';
+# TODO: Note that this doesn't actually test the code which was added for
+# bug#11338 because this syntax for prepared statements causes the PS to
+# be replicated differently than if we executed the PS from C or Java.
+# Using this syntax, variable names are inserted into the binlog instead
+# of values. The real goal of this test is to check the code that was
+# added to Item_param::query_val_str() in order to do hex encoding of
+# PS parameters when the client character set is cp932;
+# Bug#11338 has an example java program which can be used to verify this 
+# 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;
+SELECT HEX(f1) FROM t1;
+DROP table t1;
+# end test for bug#11338
 
 SET collation_connection='cp932_japanese_ci';
 -- source include/ctype_filesort.inc