diff options
author | unknown <shuichi@mysql.com> | 2005-07-18 13:38:56 -0700 |
---|---|---|
committer | unknown <shuichi@mysql.com> | 2005-07-18 13:38:56 -0700 |
commit | 21332fe0a0b510d7b5f5f171a41cbede1965c623 (patch) | |
tree | ea514d5ccc155fe5fba114f650e9688ca2caf690 /mysql-test | |
parent | c68257043108de5e58b7a769089036c6692b8df3 (diff) | |
download | mariadb-git-21332fe0a0b510d7b5f5f171a41cbede1965c623.tar.gz |
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
Diffstat (limited to 'mysql-test')
-rwxr-xr-x | mysql-test/r/ctype_eucjpms.result | 14 | ||||
-rw-r--r-- | mysql-test/t/ctype_eucjpms.test | 12 |
2 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_eucjpms.result b/mysql-test/r/ctype_eucjpms.result index a07ff9b28be..cdb28cd0fdd 100755 --- a/mysql-test/r/ctype_eucjpms.result +++ b/mysql-test/r/ctype_eucjpms.result @@ -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; diff --git a/mysql-test/t/ctype_eucjpms.test b/mysql-test/t/ctype_eucjpms.test index cec1e2a9861..3609407fe96 100644 --- a/mysql-test/t/ctype_eucjpms.test +++ b/mysql-test/t/ctype_eucjpms.test @@ -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 |