From 49fc3a76e01600e1831afb1b9b83eb938e4a954a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Jan 2003 17:39:02 +0400 Subject: [PATCH] euc_kr, koi8_r and koi8_u have been renamed so that now all charset names don't have "_" sign. --- mysql-test/r/ctype_many.result | 14 +++++++------- mysql-test/t/ctype_many.test | 4 ++-- sql/share/charsets/Index.xml | 16 ++++++++-------- strings/ctype-euc_kr.c | 4 ++-- strings/ctype.c | 8 ++++---- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/mysql-test/r/ctype_many.result b/mysql-test/r/ctype_many.result index ec6e0b76772..3a9d0ec5da5 100644 --- a/mysql-test/r/ctype_many.result +++ b/mysql-test/r/ctype_many.result @@ -1,27 +1,27 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( comment CHAR(32) ASCII NOT NULL, -koi8_ru_f CHAR(32) CHARACTER SET koi8_r NOT NULL +koi8_ru_f CHAR(32) CHARACTER SET koi8r NOT NULL ) CHARSET=latin5; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) character set latin1 NOT NULL default '', - `koi8_ru_f` char(32) character set koi8_r NOT NULL default '' + `koi8_ru_f` char(32) character set koi8r NOT NULL default '' ) TYPE=MyISAM CHARSET=latin5 ALTER TABLE t1 CHANGE comment comment CHAR(32) CHARACTER SET latin2 NOT NULL; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) character set latin2 NOT NULL default '', - `koi8_ru_f` char(32) character set koi8_r NOT NULL default '' + `koi8_ru_f` char(32) character set koi8r NOT NULL default '' ) TYPE=MyISAM CHARSET=latin5 ALTER TABLE t1 ADD latin5_f CHAR(32) NOT NULL; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) character set latin2 NOT NULL default '', - `koi8_ru_f` char(32) character set koi8_r NOT NULL default '', + `koi8_ru_f` char(32) character set koi8r NOT NULL default '', `latin5_f` char(32) character set latin5 NOT NULL default '' ) TYPE=MyISAM CHARSET=latin5 ALTER TABLE t1 CHARSET=latin2; @@ -30,7 +30,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) character set latin2 NOT NULL default '', - `koi8_ru_f` char(32) character set koi8_r NOT NULL default '', + `koi8_ru_f` char(32) character set koi8r NOT NULL default '', `latin5_f` char(32) character set latin5 NOT NULL default '', `latin2_f` char(32) character set latin2 NOT NULL default '' ) TYPE=MyISAM CHARSET=latin2 @@ -39,7 +39,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `comment` char(32) character set latin2 NOT NULL default '', - `koi8_ru_f` char(32) character set koi8_r NOT NULL default '' + `koi8_ru_f` char(32) character set koi8r NOT NULL default '' ) TYPE=MyISAM CHARSET=latin2 INSERT INTO t1 (koi8_ru_f,comment) VALUES ('a','LAT SMALL A'); INSERT INTO t1 (koi8_ru_f,comment) VALUES ('b','LAT SMALL B'); @@ -1061,7 +1061,7 @@ CYR SMALL YA CYR CAPIT YA CYR SMALL YA CYR SMALL YA SELECT t11.comment,t12.comment FROM t1 t11,t1 t12 -WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_r) +WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8r) ORDER BY t12.utf8_f,t11.comment,t12.comment; comment comment LAT CAPIT A LAT CAPIT A diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test index a807185ce44..5530eee0dbe 100644 --- a/mysql-test/t/ctype_many.test +++ b/mysql-test/t/ctype_many.test @@ -4,7 +4,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( comment CHAR(32) ASCII NOT NULL, - koi8_ru_f CHAR(32) CHARACTER SET koi8_r NOT NULL + koi8_ru_f CHAR(32) CHARACTER SET koi8r NOT NULL ) CHARSET=latin5; SHOW CREATE TABLE t1; @@ -158,7 +158,7 @@ ORDER BY t11.koi8_ru_f,t11.comment,t12.comment; SELECT t11.comment,t12.comment FROM t1 t11,t1 t12 -WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_r) +WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8r) ORDER BY t12.utf8_f,t11.comment,t12.comment; ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2; diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index 4e3baf3e875..e6cea7bc615 100644 --- a/sql/share/charsets/Index.xml +++ b/sql/share/charsets/Index.xml @@ -124,11 +124,11 @@ To make maintaining easier please: - + Cyrillic - koi8-ru + koi8-r cskoi8r - + @@ -211,11 +211,11 @@ To make maintaining easier please: - + Korean - euckr + euc_kr euc-kr - + @@ -228,10 +228,10 @@ To make maintaining easier please: - + Cyrillic koi8-u - + diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c index 5a93881a77f..814f43166c4 100644 --- a/strings/ctype-euc_kr.c +++ b/strings/ctype-euc_kr.c @@ -8637,8 +8637,8 @@ CHARSET_INFO my_charset_euc_kr = { 19, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ - "euc_kr", /* cs name */ - "euc_kr", /* name */ + "euckr", /* cs name */ + "euckr", /* name */ "", /* comment */ ctype_euc_kr, to_lower_euc_kr, diff --git a/strings/ctype.c b/strings/ctype.c index f1bce6671cf..61fb57d9ac3 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -3399,8 +3399,8 @@ static CHARSET_INFO compiled_charsets[] = { { 7, /* number */ MY_CS_COMPILED, /* state */ - "koi8_r", /* cs name */ - "koi8_r", /* name */ + "koi8r", /* cs name */ + "koi8r", /* name */ "", /* comment */ ctype_koi8_ru, to_lower_koi8_ru, @@ -3444,8 +3444,8 @@ static CHARSET_INFO compiled_charsets[] = { { 22, /* number */ MY_CS_COMPILED, /* state */ - "koi8_u", /* cs name */ - "koi8_u", /* name */ + "koi8u", /* cs name */ + "koi8u", /* name */ "", /* comment */ ctype_koi8_ukr, to_lower_koi8_ukr,