Post-merge fixes after merging mysql-5.0 with mysql-5.1-new

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

@@ -34,26 +34,3 @@ DROP table t1;
 # end test for bug#11338
 
 # End of 4.1 tests
-
-#
-# Bug#18293: Values in stored procedure written to binlog unescaped
-#
-
-delimiter |;
-CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
-                 s2 CHAR(50) CHARACTER SET cp932,
-                 d DECIMAL(10,2))|
-CREATE PROCEDURE bug18293 (IN ins1 CHAR(50),
-                           IN ins2 CHAR(50) CHARACTER SET cp932,
-                           IN ind DECIMAL(10,2))
-  BEGIN
-    INSERT INTO t4 VALUES (ins1, ins2, ind);
-  END|
-CALL bug18293("Foo's a Bar", _cp932 0xED40ED41ED42, 47.93)|
-SELECT HEX(s1),HEX(s2),d FROM t4|
-DROP PROCEDURE bug18293|
-DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 393|
-delimiter ;|
-
-# End of 5.0 tests

mysql-test/r/ctype_cp932_binlog_stm.result

@@ -15,3 +15,32 @@ SELECT HEX(f1) FROM t1;
 HEX(f1)
 8300
 DROP table t1;
+CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
+s2 CHAR(50) CHARACTER SET cp932,
+d DECIMAL(10,2))|
+CREATE PROCEDURE bug18293 (IN ins1 CHAR(50),
+IN ins2 CHAR(50) CHARACTER SET cp932,
+IN ind DECIMAL(10,2))
+BEGIN
+INSERT INTO t4 VALUES (ins1, ins2, ind);
+END|
+CALL bug18293("Foo's a Bar", _cp932 0xED40ED41ED42, 47.93)|
+SELECT HEX(s1),HEX(s2),d FROM t4|
+HEX(s1)	HEX(s2)	d
+466F6F2773206120426172	ED40ED41ED42	47.93
+DROP PROCEDURE bug18293|
+DROP TABLE t4|
+SHOW BINLOG EVENTS FROM 397|
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	397	Query	1	560	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
+s2 CHAR(50) CHARACTER SET cp932,
+d DECIMAL(10,2))
+master-bin.000001	560	Query	1	805	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),
+IN ins2 CHAR(50) CHARACTER SET cp932,
+IN ind DECIMAL(10,2))
+BEGIN
+INSERT INTO t4 VALUES (ins1, ins2, ind);
+END
+master-bin.000001	805	Query	1	1010	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1'Foo\'s a Bar'),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
+master-bin.000001	1010	Query	1	1096	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1096	Query	1	1172	use `test`; DROP TABLE t4

mysql-test/t/ctype_cp932_binlog_stm.test

@@ -3,3 +3,27 @@
 
 -- source include/have_binlog_format_statement.inc
 -- source extra/binlog_tests/ctype_cp932_binlog.test
+
+#
+# Bug#18293: Values in stored procedure written to binlog unescaped
+#
+
+delimiter |;
+CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
+                 s2 CHAR(50) CHARACTER SET cp932,
+                 d DECIMAL(10,2))|
+CREATE PROCEDURE bug18293 (IN ins1 CHAR(50),
+                           IN ins2 CHAR(50) CHARACTER SET cp932,
+                           IN ind DECIMAL(10,2))
+  BEGIN
+    INSERT INTO t4 VALUES (ins1, ins2, ind);
+  END|
+CALL bug18293("Foo's a Bar", _cp932 0xED40ED41ED42, 47.93)|
+SELECT HEX(s1),HEX(s2),d FROM t4|
+DROP PROCEDURE bug18293|
+DROP TABLE t4|
+SHOW BINLOG EVENTS FROM 397|
+delimiter ;|
+
+# End of 5.0 tests
+