From a0aa453934cf7969c3a8fef06028c9ae4d837a19 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 May 2005 15:22:55 +0500 Subject: [PATCH] bug#6504 Upper/Lower conversion bug: upper/lower conversion for LATIN LETTER D WITH STROKE was wrong in latin2. --- mysql-test/r/ctype_latin2.result | Bin 0 -> 6569 bytes mysql-test/t/ctype_latin2.test | 47 +++++++++++++++++++++++++++++++ sql/share/charsets/latin2.xml | 4 +-- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 mysql-test/r/ctype_latin2.result create mode 100644 mysql-test/t/ctype_latin2.test diff --git a/mysql-test/r/ctype_latin2.result b/mysql-test/r/ctype_latin2.result new file mode 100644 index 0000000000000000000000000000000000000000..2876accaf72bef7fcf4830192431a3bcb02d497b GIT binary patch literal 6569 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 Jiu->k@&B3jt?mE- literal 0 HcmV?d00001 diff --git a/mysql-test/t/ctype_latin2.test b/mysql-test/t/ctype_latin2.test new file mode 100644 index 00000000000..445223f534c --- /dev/null +++ b/mysql-test/t/ctype_latin2.test @@ -0,0 +1,47 @@ + +# Tests with the latin1 character set +# +--disable_warnings +drop table if exists t1; +--enable_warnings + +SET NAMES latin2; +CREATE TABLE t1 (a char(1) character set latin2); +INSERT INTO t1 VALUES (0x00),(0x01),(0x02),(0x03),(0x04),(0x05),(0x06),(0x07); +INSERT INTO t1 VALUES (0x08),(0x09),(0x0A),(0x0B),(0x0C),(0x0D),(0x0E),(0x0F); +INSERT INTO t1 VALUES (0x10),(0x11),(0x12),(0x13),(0x14),(0x15),(0x16),(0x17); +INSERT INTO t1 VALUES (0x18),(0x19),(0x1A),(0x1B),(0x1C),(0x1D),(0x1E),(0x1F); +INSERT INTO t1 VALUES (0x20),(0x21),(0x22),(0x23),(0x24),(0x25),(0x26),(0x27); +INSERT INTO t1 VALUES (0x28),(0x29),(0x2A),(0x2B),(0x2C),(0x2D),(0x2E),(0x2F); +INSERT INTO t1 VALUES (0x30),(0x31),(0x32),(0x33),(0x34),(0x35),(0x36),(0x37); +INSERT INTO t1 VALUES (0x38),(0x39),(0x3A),(0x3B),(0x3C),(0x3D),(0x3E),(0x3F); +INSERT INTO t1 VALUES (0x40),(0x41),(0x42),(0x43),(0x44),(0x45),(0x46),(0x47); +INSERT INTO t1 VALUES (0x48),(0x49),(0x4A),(0x4B),(0x4C),(0x4D),(0x4E),(0x4F); +INSERT INTO t1 VALUES (0x50),(0x51),(0x52),(0x53),(0x54),(0x55),(0x56),(0x57); +INSERT INTO t1 VALUES (0x58),(0x59),(0x5A),(0x5B),(0x5C),(0x5D),(0x5E),(0x5F); +INSERT INTO t1 VALUES (0x60),(0x61),(0x62),(0x63),(0x64),(0x65),(0x66),(0x67); +INSERT INTO t1 VALUES (0x68),(0x69),(0x6A),(0x6B),(0x6C),(0x6D),(0x6E),(0x6F); +INSERT INTO t1 VALUES (0x70),(0x71),(0x72),(0x73),(0x74),(0x75),(0x76),(0x77); +INSERT INTO t1 VALUES (0x78),(0x79),(0x7A),(0x7B),(0x7C),(0x7D),(0x7E),(0x7F); +INSERT INTO t1 VALUES (0x80),(0x81),(0x82),(0x83),(0x84),(0x85),(0x86),(0x87); +INSERT INTO t1 VALUES (0x88),(0x89),(0x8A),(0x8B),(0x8C),(0x8D),(0x8E),(0x8F); +INSERT INTO t1 VALUES (0x90),(0x91),(0x92),(0x93),(0x94),(0x95),(0x96),(0x97); +INSERT INTO t1 VALUES (0x98),(0x99),(0x9A),(0x9B),(0x9C),(0x9D),(0x9E),(0x9F); +INSERT INTO t1 VALUES (0xA0),(0xA1),(0xA2),(0xA3),(0xA4),(0xA5),(0xA6),(0xA7); +INSERT INTO t1 VALUES (0xA8),(0xA9),(0xAA),(0xAB),(0xAC),(0xAD),(0xAE),(0xAF); +INSERT INTO t1 VALUES (0xB0),(0xB1),(0xB2),(0xB3),(0xB4),(0xB5),(0xB6),(0xB7); +INSERT INTO t1 VALUES (0xB8),(0xB9),(0xBA),(0xBB),(0xBC),(0xBD),(0xBE),(0xBF); +INSERT INTO t1 VALUES (0xC0),(0xC1),(0xC2),(0xC3),(0xC4),(0xC5),(0xC6),(0xC7); +INSERT INTO t1 VALUES (0xC8),(0xC9),(0xCA),(0xCB),(0xCC),(0xCD),(0xCE),(0xCF); +INSERT INTO t1 VALUES (0xD0),(0xD1),(0xD2),(0xD3),(0xD4),(0xD5),(0xD6),(0xD7); +INSERT INTO t1 VALUES (0xD8),(0xD9),(0xDA),(0xDB),(0xDC),(0xDD),(0xDE),(0xDF); +INSERT INTO t1 VALUES (0xE0),(0xE1),(0xE2),(0xE3),(0xE4),(0xE5),(0xE6),(0xE7); +INSERT INTO t1 VALUES (0xE8),(0xE9),(0xEA),(0xEB),(0xEC),(0xED),(0xEE),(0xEF); +INSERT INTO t1 VALUES (0xF0),(0xF1),(0xF2),(0xF3),(0xF4),(0xF5),(0xF6),(0xF7); +INSERT INTO t1 VALUES (0xF8),(0xF9),(0xFA),(0xFB),(0xFC),(0xFD),(0xFE),(0xFF); + +# +# Bug#6504 upper/lower conversion bug +# +SELECT hex(a) ha, hex(lower(a)) hl, hex(upper(a)) hu, +a, lower(a) l, upper(a) u from t1 order by ha; diff --git a/sql/share/charsets/latin2.xml b/sql/share/charsets/latin2.xml index 702f052604b..3ae239cb8fd 100644 --- a/sql/share/charsets/latin2.xml +++ b/sql/share/charsets/latin2.xml @@ -60,7 +60,7 @@ A0 B1 A2 B3 A4 B5 B6 A7 A8 B9 BA BB BC AD BE BF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE BF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF - D0 F1 F2 F3 F4 F5 F6 D7 F8 F9 FA FB FC FD FE DF + F0 F1 F2 F3 F4 F5 F6 D7 F8 F9 FA FB FC FD FE DF E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF @@ -84,7 +84,7 @@ C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE DF C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF - F0 D1 D2 D3 D4 D5 D6 F7 D8 D9 DA DB DC DD DE FF + D0 D1 D2 D3 D4 D5 D6 F7 D8 D9 DA DB DC DD DE FF