database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

euc_kr, koi8_r and koi8_u have been renamed so that now

Browse Source 
all charset names don't have "_" sign.
This commit is contained in:
unknown
2003-01-09 17:39:02 +04:00
parent 90bf0f9735
commit 49fc3a76e0
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/ctype_many.result
View File

@ -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

4
mysql-test/t/ctype_many.test
View File

@ -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;

16
sql/share/charsets/Index.xml
View File

@ -124,11 +124,11 @@ To make maintaining easier please:
</collation>
</charset>
<charset name="koi8_r">
<charset name="koi8r">
<family>Cyrillic</family>
<alias>koi8-ru</alias>
<alias>koi8-r</alias>
<alias>cskoi8r</alias>
<collation name="koi8_r" id="7" order="Russian" flag="primary"/>
<collation name="koi8r" id="7" order="Russian" flag="primary"/>
</charset>
<charset name="swe7">
@ -211,11 +211,11 @@ To make maintaining easier please:
<collation name="tis620" id="18" order="Thai" flag="primary" flag="compiled"/>
</charset>
<charset name="euc_kr">
<charset name="euckr">
<family>Korean</family>
<alias>euckr</alias>
<alias>euc_kr</alias>
<alias>euc-kr</alias>
<collation name="euc_kr" id="19" order="Korean" flag="primary" flag="compiled"/>
<collation name="euckr" id="19" order="Korean" flag="primary" flag="compiled"/>
</charset>
<charset name="latin7">
@ -228,10 +228,10 @@ To make maintaining easier please:
<collation name="latvian1" id="42" order="Latvian"/>
</charset>
<charset name="koi8_u">
<charset name="koi8u">
<family>Cyrillic</family>
<alias>koi8-u</alias>
<collation name="koi8_u" id="22" order="Ukranian" flag="primary"/>
<collation name="koi8u" id="22" order="Ukranian" flag="primary"/>
</charset>
<charset name="gb2312">

4
strings/ctype-euc_kr.c
View File

@ -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,

8
strings/ctype.c
View File

@ -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,