diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-04-07 18:49:56 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-04-07 18:49:56 +0500 |
| commit | 9dfe574c41921b708b1b701e3bb880b1d2ad2f23 (patch) | |
| tree | 637d5001b8838fef9c41ed0f1a17d841b9ed9a2d /strings | |
| parent | b4eb7b35082ee8f9cc2c3a466299cf7c5d3c959a (diff) | |
| download | mariadb-git-9dfe574c41921b708b1b701e3bb880b1d2ad2f23.tar.gz | |
All collation names are now fit into convension
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-big5.c | 2 | ||||
| -rw-r--r-- | strings/ctype-euc_kr.c | 2 | ||||
| -rw-r--r-- | strings/ctype-gb2312.c | 2 | ||||
| -rw-r--r-- | strings/ctype-gbk.c | 2 | ||||
| -rw-r--r-- | strings/ctype-sjis.c | 2 | ||||
| -rw-r--r-- | strings/ctype-tis620.c | 2 | ||||
| -rw-r--r-- | strings/ctype-ujis.c | 2 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 4 |
8 files changed, 9 insertions, 9 deletions
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 7be631bbe05..57ee2d7c6ae 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -6231,7 +6231,7 @@ CHARSET_INFO my_charset_big5 = 1,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "big5", /* cs name */ - "big5", /* name */ + "big5_chinese_ci", /* name */ "", /* comment */ ctype_big5, to_lower_big5, diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c index 0766cd40040..21f01b6509c 100644 --- a/strings/ctype-euc_kr.c +++ b/strings/ctype-euc_kr.c @@ -8639,7 +8639,7 @@ CHARSET_INFO my_charset_euc_kr = 19,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ "euckr", /* cs name */ - "euckr", /* name */ + "euckr_korean_ci", /* name */ "", /* comment */ ctype_euc_kr, to_lower_euc_kr, diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c index ec495be5e84..f1ec5a9f363 100644 --- a/strings/ctype-gb2312.c +++ b/strings/ctype-gb2312.c @@ -5689,7 +5689,7 @@ CHARSET_INFO my_charset_gb2312 = 24,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ "gb2312", /* cs name */ - "gb2312", /* name */ + "gb2312_chinese_ci",/* name */ "", /* comment */ ctype_gb2312, to_lower_gb2312, diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c index 7673f4e6c23..b1ea209d6ad 100644 --- a/strings/ctype-gbk.c +++ b/strings/ctype-gbk.c @@ -9886,7 +9886,7 @@ CHARSET_INFO my_charset_gbk = 28,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "gbk", /* cs name */ - "gbk", /* name */ + "gbk_chinese_ci", /* name */ "", /* comment */ ctype_gbk, to_lower_gbk, diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index b2b1a40bdcc..fd911f1867e 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4473,7 +4473,7 @@ CHARSET_INFO my_charset_sjis = 13,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "sjis", /* cs name */ - "sjis", /* name */ + "sjis_japanese_ci", /* name */ "", /* comment */ ctype_sjis, to_lower_sjis, diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c index 9da7b02ed31..21722f317a1 100644 --- a/strings/ctype-tis620.c +++ b/strings/ctype-tis620.c @@ -701,7 +701,7 @@ CHARSET_INFO my_charset_tis620 = 18,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "tis620", /* cs name */ - "tis620", /* name */ + "tis620_thai_ci", /* name */ "", /* comment */ ctype_tis620, to_lower_tis620, diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c index de73608293c..92214868018 100644 --- a/strings/ctype-ujis.c +++ b/strings/ctype-ujis.c @@ -8430,7 +8430,7 @@ CHARSET_INFO my_charset_ujis = 12,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY, /* state */ "ujis", /* cs name */ - "ujis", /* name */ + "ujis_japanese_ci", /* name */ "", /* comment */ ctype_ujis, to_lower_ujis, diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 69500f6d3d6..4c908014994 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1955,7 +1955,7 @@ CHARSET_INFO my_charset_utf8 = 33,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "utf8", /* cs name */ - "utf8", /* name */ + "utf8_general_ci", /* name */ "", /* comment */ ctype_utf8, /* ctype */ to_lower_utf8, /* to_lower */ @@ -3030,7 +3030,7 @@ CHARSET_INFO my_charset_ucs2 = 35,0,0, /* number */ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM, /* state */ "ucs2", /* cs name */ - "ucs2", /* name */ + "ucs2_general_ci", /* name */ "", /* comment */ ctype_ucs2, /* ctype */ to_lower_ucs2, /* to_lower */ |