summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/ac-macros/character_sets.m414
-rw-r--r--include/m_ctype.h4
-rw-r--r--libmysql/Makefile.shared2
-rwxr-xr-xmysql-test/r/ctype_cp932.result2
-rwxr-xr-xmysql-test/r/ctype_eucjpms.result (renamed from mysql-test/r/ctype_eucjp_ms.result)12
-rwxr-xr-xmysql-test/t/ctype_cp932.test4
-rwxr-xr-xmysql-test/t/ctype_eucjpms.test (renamed from mysql-test/t/ctype_eucjp_ms.test)9
-rw-r--r--mysys/charset-def.c6
-rw-r--r--sql/share/charsets/Index.xml6
-rw-r--r--strings/Makefile.am8
-rw-r--r--strings/ctype-eucjpms.c (renamed from strings/ctype-eucjp_ms.c)64
11 files changed, 67 insertions, 64 deletions
diff --git a/config/ac-macros/character_sets.m4 b/config/ac-macros/character_sets.m4
index e1e4caba1c8..c83cc63a8aa 100644
--- a/config/ac-macros/character_sets.m4
+++ b/config/ac-macros/character_sets.m4
@@ -7,14 +7,14 @@ AC_DIVERT_PUSH(0)
define(CHARSETS_AVAILABLE0,binary)
define(CHARSETS_AVAILABLE1,armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257)
-define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 eucjp_ms euckr gb2312 gbk geostd8)
+define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 eucjpms euckr gb2312 gbk geostd8)
define(CHARSETS_AVAILABLE3,greek hebrew hp8 keybcs2 koi8r koi8u)
define(CHARSETS_AVAILABLE4,latin1 latin2 latin5 latin7 macce macroman)
define(CHARSETS_AVAILABLE5,sjis swe7 tis620 ucs2 ujis utf8)
DEFAULT_CHARSET=latin1
CHARSETS_AVAILABLE="CHARSETS_AVAILABLE0 CHARSETS_AVAILABLE1 CHARSETS_AVAILABLE2 CHARSETS_AVAILABLE3 CHARSETS_AVAILABLE4 CHARSETS_AVAILABLE5"
-CHARSETS_COMPLEX="big5 cp1250 cp932 eucjp_ms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8"
+CHARSETS_COMPLEX="big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8"
AC_DIVERT_POP
@@ -111,8 +111,8 @@ do
dec8)
AC_DEFINE(HAVE_CHARSET_dec8, 1, [Define to enable charset dec8])
;;
- eucjp_ms)
- AC_DEFINE(HAVE_CHARSET_eucjp_ms, 1, [Define to enable charset eucjp_ms])
+ eucjpms)
+ AC_DEFINE(HAVE_CHARSET_eucjpms, 1, [Define to enable charset eucjpms])
AC_DEFINE([USE_MB], [1], [Use multi-byte character routines])
AC_DEFINE(USE_MB_IDENT, 1)
;;
@@ -259,9 +259,9 @@ case $default_charset in
default_charset_default_collation="dec8_swedish_ci"
default_charset_collations="dec8_swedish_ci dec8_bin"
;;
- eucjp_ms)
- default_charset_default_collation="eucjp_ms_japanese_ci"
- default_charset_collations="eucjp_ms_japanese_ci ujis_bin"
+ eucjpms)
+ default_charset_default_collation="eucjpms_japanese_ci"
+ default_charset_collations="eucjpms_japanese_ci ujis_bin"
;;
euckr)
default_charset_default_collation="euckr_korean_ci"
diff --git a/include/m_ctype.h b/include/m_ctype.h
index ad70f3868fd..c2354c7feff 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -232,8 +232,8 @@ extern CHARSET_INFO my_charset_big5_chinese_ci;
extern CHARSET_INFO my_charset_big5_bin;
extern CHARSET_INFO my_charset_cp932_japanese_ci;
extern CHARSET_INFO my_charset_cp932_bin;
-extern CHARSET_INFO my_charset_eucjp_ms_japanese_ci;
-extern CHARSET_INFO my_charset_eucjp_ms_bin;
+extern CHARSET_INFO my_charset_eucjpms_japanese_ci;
+extern CHARSET_INFO my_charset_eucjpms_bin;
extern CHARSET_INFO my_charset_euckr_korean_ci;
extern CHARSET_INFO my_charset_euckr_bin;
extern CHARSET_INFO my_charset_gb2312_chinese_ci;
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index d09c898d542..c5dc1de0c5a 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -42,7 +42,7 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \
bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \
strtoull.lo strtoll.lo llstr.lo my_vsnprintf.lo \
ctype.lo ctype-simple.lo ctype-bin.lo ctype-mb.lo \
- ctype-big5.lo ctype-czech.lo ctype-cp932.lo ctype-eucjp_ms.lo ctype-euc_kr.lo \
+ ctype-big5.lo ctype-czech.lo ctype-cp932.lo ctype-eucjpms.lo ctype-euc_kr.lo \
ctype-win1250ch.lo ctype-utf8.lo ctype-extra.lo \
ctype-ucs2.lo ctype-gb2312.lo ctype-gbk.lo \
ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo \
diff --git a/mysql-test/r/ctype_cp932.result b/mysql-test/r/ctype_cp932.result
index 833a5223b48..c5e57d996fd 100755
--- a/mysql-test/r/ctype_cp932.result
+++ b/mysql-test/r/ctype_cp932.result
@@ -8573,7 +8573,7 @@ F9F9
F9FA
F9FB
F9FC
-CREATE TABLE t4 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t1;
+CREATE TABLE t4 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t1;
SELECT HEX(c1) FROM t4;
HEX(c1)
05
diff --git a/mysql-test/r/ctype_eucjp_ms.result b/mysql-test/r/ctype_eucjpms.result
index 8684f626cde..f3c22a55a54 100755
--- a/mysql-test/r/ctype_eucjp_ms.result
+++ b/mysql-test/r/ctype_eucjpms.result
@@ -2,9 +2,9 @@ drop table if exists t1;
drop table if exists t2;
drop table if exists t3;
drop table if exists t4;
-set names eucjp_ms;
-set character_set_database = eucjp_ms;
-CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjp_ms;
+set names eucjpms;
+set character_set_database = eucjpms;
+CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjpms;
INSERT INTO t1 VALUES
(0x5C),(0x7E),(0xA1B1),(0xA1BD),(0xA1C0),(0xA1C1),(0xA1C2),(0xA1DD),(0xA1F1),(0xA1F2),(0xA1EF),(0xA2CC),(0x8FA2B7),(0x8FA2C3);
INSERT INTO t1 VALUES
@@ -5045,7 +5045,7 @@ E754
E755
E756
E757
-CREATE TABLE t3 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t2;
+CREATE TABLE t3 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t2;
SELECT HEX(c1) FROM t3;
HEX(c1)
5C
@@ -9781,3 +9781,7 @@ F9F9
F9FA
F9FB
F9FC
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
diff --git a/mysql-test/t/ctype_cp932.test b/mysql-test/t/ctype_cp932.test
index d05f48a3c69..504468b1e1d 100755
--- a/mysql-test/t/ctype_cp932.test
+++ b/mysql-test/t/ctype_cp932.test
@@ -387,8 +387,8 @@ SELECT HEX(c1) FROM t2;
CREATE TABLE t3 SELECT CONVERT(c1 USING cp932) AS c1 FROM t2;
SELECT HEX(c1) FROM t3;
-#Test conversion to eucjp_ms
-CREATE TABLE t4 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t1;
+#Test conversion to eucjpms
+CREATE TABLE t4 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t1;
SELECT HEX(c1) FROM t4;
DROP TABLE t1;
diff --git a/mysql-test/t/ctype_eucjp_ms.test b/mysql-test/t/ctype_eucjpms.test
index 8706b5f7217..abc7105c12e 100755
--- a/mysql-test/t/ctype_eucjp_ms.test
+++ b/mysql-test/t/ctype_eucjpms.test
@@ -1,4 +1,3 @@
---character_set eucjp_ms
--disable_warnings
drop table if exists t1;
drop table if exists t2;
@@ -6,10 +5,10 @@ drop table if exists t3;
drop table if exists t4;
--enable_warnings
-set names eucjp_ms;
-set character_set_database = eucjp_ms;
+set names eucjpms;
+set character_set_database = eucjpms;
-CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjp_ms;
+CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjpms;
#Characters which are converted to Unicode ambiguously
INSERT INTO t1 VALUES
@@ -332,7 +331,7 @@ CREATE TABLE t2 SELECT CONVERT(c1 USING ucs2) AS c1 FROM t1;
SELECT HEX(c1) FROM t2;
#Test round trip conversion
-CREATE TABLE t3 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t2;
+CREATE TABLE t3 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t2;
SELECT HEX(c1) FROM t3;
#Test conversion to cp932
diff --git a/mysys/charset-def.c b/mysys/charset-def.c
index 9977052ed8d..b8676a5d3d4 100644
--- a/mysys/charset-def.c
+++ b/mysys/charset-def.c
@@ -90,9 +90,9 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused)))
add_compiled_collation(&my_charset_latin2_czech_ci);
#endif
-#ifdef HAVE_CHARSET_eucjp_ms
- add_compiled_collation(&my_charset_eucjp_ms_japanese_ci);
- add_compiled_collation(&my_charset_eucjp_ms_bin);
+#ifdef HAVE_CHARSET_eucjpms
+ add_compiled_collation(&my_charset_eucjpms_japanese_ci);
+ add_compiled_collation(&my_charset_eucjpms_bin);
#endif
#ifdef HAVE_CHARSET_euckr
diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml
index 74dad91af2e..3c35ec98a92 100644
--- a/sql/share/charsets/Index.xml
+++ b/sql/share/charsets/Index.xml
@@ -569,18 +569,18 @@ To make maintaining easier please:
</collation>
</charset>
-<charset name="eucjp_ms">
+<charset name="eucjpms">
<family>Japanese</family>
<description>UJIS for Windows Japanese</description>
<alias>eucjpms</alias>
<alias>eucJP_ms</alias>
<alias>ujis_ms</alias>
<alias>ujis_cp932</alias>
- <collation name="eucjp_ms_japanese_ci" id="97" order="Japanese">
+ <collation name="eucjpms_japanese_ci" id="97" order="Japanese">
<flag>primary</flag>
<flag>compiled</flag>
</collation>
- <collation name="eucjp_ms_bin" id="98" order="Japanese">
+ <collation name="eucjpms_bin" id="98" order="Japanese">
<flag>binary</flag>
<flag>compiled</flag>
</collation>
diff --git a/strings/Makefile.am b/strings/Makefile.am
index cf5cba2e41d..508c127dcb4 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -22,19 +22,19 @@ pkglib_LIBRARIES = libmystrings.a
# Exact one of ASSEMBLER_X
if ASSEMBLER_x86
ASRCS = strings-x86.s longlong2str-x86.s my_strtoll10-x86.s
-CSRCS = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c strtod.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjp_ms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c
+CSRCS = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c strtod.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c
else
if ASSEMBLER_sparc32
# These file MUST all be on the same line!! Otherwise automake
# generats a very broken makefile
ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s
-CSRCS = strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c strtod.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c strxmov.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjp_ms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c my_strtoll10.c
+CSRCS = strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c strtod.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c strxmov.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c my_strtoll10.c
else
#no assembler
ASRCS =
# These file MUST all be on the same line!! Otherwise automake
# generats a very broken makefile
-CSRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c strtod.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjp_ms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c my_strtoll10.c
+CSRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c strtod.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c my_strtoll10.c
endif
endif
@@ -42,7 +42,7 @@ libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
noinst_PROGRAMS = conf_to_src
DISTCLEANFILES = ctype_autoconf.c
# Default charset definitions
-EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjp_ms.c ctype-euc_kr.c ctype-win1250ch.c \
+EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-win1250ch.c \
ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-utf8.c \
ctype-ucs2.c ctype-uca.c ctype-tis620.c ctype-ujis.c \
xml.c decimal.c strto.c strings-x86.s \
diff --git a/strings/ctype-eucjp_ms.c b/strings/ctype-eucjpms.c
index 29759622837..5b108d24f4b 100644
--- a/strings/ctype-eucjp_ms.c
+++ b/strings/ctype-eucjpms.c
@@ -23,17 +23,17 @@ ctype-ujis.c file.
* This comment is parsed by configure to create ctype.c,
* so don't change it unless you know what you are doing.
*
- * .configure. mbmaxlen_eucjp_ms=3
+ * .configure. mbmaxlen_eucjpms=3
*/
#include <my_global.h>
#include "m_string.h"
#include "m_ctype.h"
-#ifdef HAVE_CHARSET_eucjp_ms
+#ifdef HAVE_CHARSET_eucjpms
-static uchar NEAR ctype_eucjp_ms[257] =
+static uchar NEAR ctype_eucjpms[257] =
{
0, /* For standard library */
0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, /* NUL ^A - ^G */
@@ -70,7 +70,7 @@ static uchar NEAR ctype_eucjp_ms[257] =
0020, 0020, 0020, 0020, 0020, 0020, 0020, 0000,
};
-static uchar NEAR to_lower_eucjp_ms[]=
+static uchar NEAR to_lower_eucjpms[]=
{
'\000','\001','\002','\003','\004','\005','\006','\007',
'\010','\011','\012','\013','\014','\015','\016','\017',
@@ -106,7 +106,7 @@ static uchar NEAR to_lower_eucjp_ms[]=
(uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377'
};
-static uchar NEAR to_upper_eucjp_ms[]=
+static uchar NEAR to_upper_eucjpms[]=
{
'\000','\001','\002','\003','\004','\005','\006','\007',
'\010','\011','\012','\013','\014','\015','\016','\017',
@@ -142,7 +142,7 @@ static uchar NEAR to_upper_eucjp_ms[]=
(uchar) '\370',(uchar) '\371',(uchar) '\372',(uchar) '\373',(uchar) '\374',(uchar) '\375',(uchar) '\376',(uchar) '\377'
};
-static uchar NEAR sort_order_eucjp_ms[]=
+static uchar NEAR sort_order_eucjpms[]=
{
'\000','\001','\002','\003','\004','\005','\006','\007',
'\010','\011','\012','\013','\014','\015','\016','\017',
@@ -179,25 +179,25 @@ static uchar NEAR sort_order_eucjp_ms[]=
};
-#define iseucjp_ms(c) ((0xa1<=((c)&0xff) && ((c)&0xff)<=0xfe))
+#define iseucjpms(c) ((0xa1<=((c)&0xff) && ((c)&0xff)<=0xfe))
#define iskata(c) ((0xa1<=((c)&0xff) && ((c)&0xff)<=0xdf))
-#define iseucjp_ms_ss2(c) (((c)&0xff) == 0x8e)
-#define iseucjp_ms_ss3(c) (((c)&0xff) == 0x8f)
+#define iseucjpms_ss2(c) (((c)&0xff) == 0x8e)
+#define iseucjpms_ss3(c) (((c)&0xff) == 0x8f)
-static int ismbchar_eucjp_ms(CHARSET_INFO *cs __attribute__((unused)),
+static int ismbchar_eucjpms(CHARSET_INFO *cs __attribute__((unused)),
const char* p, const char *e)
{
return ((*(uchar*)(p)<0x80)? 0:\
- iseucjp_ms(*(p)) && (e)-(p)>1 && iseucjp_ms(*((p)+1))? 2:\
- iseucjp_ms_ss2(*(p)) && (e)-(p)>1 && iskata(*((p)+1))? 2:\
- iseucjp_ms_ss3(*(p)) && (e)-(p)>2 && iseucjp_ms(*((p)+1)) && iseucjp_ms(*((p)+2))? 3:\
+ iseucjpms(*(p)) && (e)-(p)>1 && iseucjpms(*((p)+1))? 2:\
+ iseucjpms_ss2(*(p)) && (e)-(p)>1 && iskata(*((p)+1))? 2:\
+ iseucjpms_ss3(*(p)) && (e)-(p)>2 && iseucjpms(*((p)+1)) && iseucjpms(*((p)+2))? 3:\
0);
}
-static int mbcharlen_eucjp_ms(CHARSET_INFO *cs __attribute__((unused)),uint c)
+static int mbcharlen_eucjpms(CHARSET_INFO *cs __attribute__((unused)),uint c)
{
- return (iseucjp_ms(c)? 2: iseucjp_ms_ss2(c)? 2: iseucjp_ms_ss3(c)? 3: 1);
+ return (iseucjpms(c)? 2: iseucjpms_ss2(c)? 2: iseucjpms_ss3(c)? 3: 1);
}
@@ -8387,7 +8387,7 @@ my_jisx0212_uni_onechar(int code){
*/
static
-uint my_well_formed_len_eucjp_ms(CHARSET_INFO *cs __attribute__((unused)),
+uint my_well_formed_len_eucjpms(CHARSET_INFO *cs __attribute__((unused)),
const char *beg, const char *end, uint pos)
{
const uchar *b= (uchar *) beg;
@@ -8646,11 +8646,11 @@ static MY_COLLATION_HANDLER my_collation_ci_handler =
static MY_CHARSET_HANDLER my_charset_handler=
{
NULL, /* init */
- ismbchar_eucjp_ms,
- mbcharlen_eucjp_ms,
+ ismbchar_eucjpms,
+ mbcharlen_eucjpms,
my_numchars_mb,
my_charpos_mb,
- my_well_formed_len_eucjp_ms,
+ my_well_formed_len_eucjpms,
my_lengthsp_8bit,
my_numcells_eucjp,
my_mb_wc_euc_jp, /* mb_wc */
@@ -8674,18 +8674,18 @@ static MY_CHARSET_HANDLER my_charset_handler=
-CHARSET_INFO my_charset_eucjp_ms_japanese_ci=
+CHARSET_INFO my_charset_eucjpms_japanese_ci=
{
97,0,0, /* number */
MY_CS_COMPILED|MY_CS_PRIMARY, /* state */
- "eucjp_ms", /* cs name */
- "eucjp_ms_japanese_ci", /* name */
+ "eucjpms", /* cs name */
+ "eucjpms_japanese_ci", /* name */
"", /* comment */
NULL, /* tailoring */
- ctype_eucjp_ms,
- to_lower_eucjp_ms,
- to_upper_eucjp_ms,
- sort_order_eucjp_ms,
+ ctype_eucjpms,
+ to_lower_eucjpms,
+ to_upper_eucjpms,
+ sort_order_eucjpms,
NULL, /* sort_order_big*/
NULL, /* contractions */
NULL, /* tab_to_uni */
@@ -8702,17 +8702,17 @@ CHARSET_INFO my_charset_eucjp_ms_japanese_ci=
};
-CHARSET_INFO my_charset_eucjp_ms_bin=
+CHARSET_INFO my_charset_eucjpms_bin=
{
98,0,0, /* number */
MY_CS_COMPILED|MY_CS_BINSORT, /* state */
- "eucjp_ms", /* cs name */
- "eucjp_ms_bin", /* name */
+ "eucjpms", /* cs name */
+ "eucjpms_bin", /* name */
"", /* comment */
NULL, /* tailoring */
- ctype_eucjp_ms,
- to_lower_eucjp_ms,
- to_upper_eucjp_ms,
+ ctype_eucjpms,
+ to_lower_eucjpms,
+ to_upper_eucjpms,
NULL, /* sort_order */
NULL, /* contractions */
NULL, /* sort_order_big*/
View Lorry Controller Status