Commit e234bbea authored by unknown's avatar unknown
Browse files

renamed charset name 'eucjp_ms' to 'eucjpms'

parent dd3cfa8d

config/ac-macros/character_sets.m4

+7 −7
Original line number Diff line number Diff line
@@ -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"

include/m_ctype.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

libmysql/Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -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 \

mysql-test/r/ctype_cp932.result

+1 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/r/ctype_eucjp_ms.result→mysql-test/r/ctype_eucjpms.result

+8 −4
Original line number Diff line number Diff line
@@ -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;