Commit fa3016a8 authored by unknown's avatar unknown
Browse files

Added cp932 character set

parent 25896a82

configure.in

+11 −2
Original line number Diff line number Diff line
@@ -2500,14 +2500,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 dec8 euckr gb2312 gbk geostd8)

define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 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 euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8"

CHARSETS_COMPLEX="big5 cp1250 cp932 euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8"



AC_DIVERT_POP
@@ -2596,6 +2596,11 @@ do 
    cp866)

      AC_DEFINE(HAVE_CHARSET_cp866, 1, [Define to enable charset cp866])

      ;;

    cp932)

      AC_DEFINE(HAVE_CHARSET_cp932, 1, [Define to enable charset cp932])

      AC_DEFINE([USE_MB], 1, [Use multi-byte character routines])

      AC_DEFINE(USE_MB_IDENT, 1)

      ;;

    dec8)

      AC_DEFINE(HAVE_CHARSET_dec8, 1, [Define to enable charset dec8])

      ;;
@@ -2734,6 +2739,10 @@ case $default_charset in 
      default_charset_default_collation="cp866_general_ci"

      default_charset_collations="cp866_general_ci cp866_bin"

      ;;

    cp932)

      default_charset_default_collation="cp932_japanese_ci"

      default_charset_collations="cp932_japanese_ci cp932_bin"

      ;;

    dec8)

      default_charset_default_collation="dec8_swedish_ci"

      default_charset_collations="dec8_swedish_ci dec8_bin"

include/m_ctype.h

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,8 @@ typedef struct charset_info_st 
extern CHARSET_INFO my_charset_bin;

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_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-euc_kr.lo \

			ctype-big5.lo ctype-cp932.lo ctype-czech.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 \

mysys/charset-def.c

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) 
  add_compiled_collation(&my_charset_cp1250_czech_ci);

#endif



#ifdef HAVE_CHARSET_cp932

  add_compiled_collation(&my_charset_cp932_japanese_ci);

  add_compiled_collation(&my_charset_cp932_bin);

#endif



#ifdef HAVE_CHARSET_latin2

  add_compiled_collation(&my_charset_latin2_czech_ci);

#endif

sql/share/charsets/Index.xml

+21 −1
Original line number Diff line number Diff line 
<?xml version='1.0' encoding="utf-8"?>



<charsets max-id="94">

<charsets max-id="96">



<copyright>

 Copyright (C) 2003 MySQL AB
@@ -553,5 +553,25 @@ To make maintaining easier please: 
  </collation>

</charset>



<charset name="cp932">

  <family>Japanese</family>

  <description>SJIS for Windows Japanese</description>

  <alias>windows-31j</alias>

  <alias>cswindows31j</alias>

  <alias>sjisms</alias>

  <alias>windows-95j</alias>

  <alias>x-sjis-cp932</alias>

  <alias>ms932</alias>

  <alias>sjisms</alias>

  <collation name="cp932_japanese_ci"    id="95" order="Japanese">

    <flag>primary</flag>

    <flag>compiled</flag>

  </collation>

  <collation name="cp932_bin"    id="96" order="Binary">

    <flag>binary</flag>

    <flag>compiled</flag>

  </collation>

</charset>



</charsets>