Commit 4a83cd38 authored by unknown's avatar unknown
Browse files

Additional test changes for 

Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
Positions of some binlog events were changed because of
additional logging of @@collation_database.
parent 18f1d1a2

mysql-test/r/ctype_cp932_binlog.result

+9 −9
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 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	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')

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
@@ -30,17 +30,17 @@ HEX(s1) HEX(s2) d 
466F6F2773206120426172	ED40ED41ED42	47.93

DROP PROCEDURE bug18293|

DROP TABLE t4|

SHOW BINLOG EVENTS FROM 393|

SHOW BINLOG EVENTS FROM 402|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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	556	Query	1	801	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),

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	801	Query	1	1017	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1017	Query	1	1103	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1103	Query	1	1179	use `test`; DROP TABLE t4
 
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

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 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	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')

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

mysql-test/t/ctype_cp932_binlog.test

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 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|

SHOW BINLOG EVENTS FROM 402|

delimiter ;|



# End of 5.0 tests