Commit 21332fe0 authored by unknown's avatar unknown
Browse files

Fixed the ucs2 -> eucjpms conversion bug (bug#11717) 


mysql-test/r/ctype_eucjpms.result:
  Added test for the bug#11717
mysql-test/t/ctype_eucjpms.test:
  Added test for the bug#11717
strings/ctype-eucjpms.c:
  Fixed the ucs2 -> eucjpms conversion bug
parent c6825704

mysql-test/r/ctype_eucjpms.result

+14 −0
Original line number Diff line number Diff line
@@ -9785,6 +9785,20 @@ DROP TABLE t1; 
DROP TABLE t2;

DROP TABLE t3;

DROP TABLE t4;

CREATE TABLE t1(c1 varchar(10)) default character set = eucjpms;

insert into t1 values(_ucs2 0x00F7);

insert into t1 values(_eucjpms 0xA1E0);

insert into t1 values(_ujis 0xA1E0);

insert into t1 values(_sjis 0x8180);

insert into t1 values(_cp932 0x8180);

SELECT HEX(c1) FROM t1;

HEX(c1)

A1E0

A1E0

A1E0

A1E0

A1E0

DROP TABLE t1;

SET collation_connection='eucjpms_japanese_ci';

create table t1 select repeat('a',4000) a;

delete from t1;

mysql-test/t/ctype_eucjpms.test

+12 −0
Original line number Diff line number Diff line
@@ -346,6 +346,18 @@ DROP TABLE t2; 
DROP TABLE t3;

DROP TABLE t4;



#Test bug#11717

CREATE TABLE t1(c1 varchar(10)) default character set = eucjpms;



insert into t1 values(_ucs2 0x00F7);

insert into t1 values(_eucjpms 0xA1E0);

insert into t1 values(_ujis 0xA1E0);

insert into t1 values(_sjis 0x8180);

insert into t1 values(_cp932 0x8180);



SELECT HEX(c1) FROM t1;



DROP TABLE t1;



SET collation_connection='eucjpms_japanese_ci';

-- source include/ctype_filesort.inc

strings/ctype-eucjpms.c

+1 −1
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ static uint16 tab_uni_jisx02082[]={ 


/* page 3 0x00F7-0x00F7 */

static uint16 tab_uni_jisx02083[]={

0x07};

0x2160};



/* page 4 0x0391-0x03C9 */

static uint16 tab_uni_jisx02084[]={