Commit b9959b74 authored by unknown's avatar unknown
Browse files

after merge fix

parent 783634d6

mysql-test/t/ctype_cp932_binlog.test→mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

+3 −24
Original line number Diff line number Diff line
@@ -26,32 +26,11 @@ 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 98;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

SHOW BINLOG EVENTS FROM 102;

SELECT HEX(f1) FROM t1;

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 402|

delimiter ;|



# End of 5.0 tests

mysql-test/r/binlog_stm_ctype_ucs.result

0 → 100644
+27 −0
Original line number Diff line number Diff line 
SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	102	User var	1	142	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	142	Query	1	231	use `test`; insert into t2 values (@v)

flush logs;

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

DELIMITER /*!*/;

ROLLBACK/*!*/;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`/*!*/;

use test/*!*/;

SET TIMESTAMP=10000/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t2 values (@v)/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

drop table t2;

mysql-test/r/ctype_cp932_binlog.result

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
drop table if exists t1;

set names cp932;

set character_set_database = cp932;

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 98;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	98	Query	1	188	use `test`; CREATE TABLE t1(f1 blob)

master-bin.000001	188	User var	1	227	@`var1`=_binary 0x8300 COLLATE binary

master-bin.000001	227	Query	1	323	use `test`; INSERT INTO t1 VALUES(@'var1')

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 402|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	402	Query	1	568	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,

s2 CHAR(50) CHARACTER SET cp932,

d DECIMAL(10,2))

master-bin.000001	568	Query	1	816	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	816	Query	1	1035	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1035	Query	1	1124	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1124	Query	1	1203	use `test`; DROP TABLE t4

mysql-test/r/ctype_cp932_notembedded.result

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
drop table if exists t1;

set names cp932;

set character_set_database = cp932;

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 98;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	98	Query	1	188	use `test`; CREATE TABLE t1(f1 blob)

master-bin.000001	188	User var	1	227	@`var1`=_binary 0x8300 COLLATE binary

master-bin.000001	227	Query	1	323	use `test`; INSERT INTO t1 VALUES(@'var1')

SELECT HEX(f1) FROM t1;

HEX(f1)

8300

DROP table t1;