Commit edbef416 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/my/mysql-5.0


sql/opt_range.cc:
  Auto merged
parents 547b78c5 dd3cfa8d

config/ac-macros/character_sets.m4

+20 −2
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 dec8 euckr gb2312 gbk geostd8)

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



AC_DIVERT_POP
@@ -103,9 +103,19 @@ 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])

      ;;

    eucjp_ms)

      AC_DEFINE(HAVE_CHARSET_eucjp_ms, 1, [Define to enable charset eucjp_ms])

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

      AC_DEFINE(USE_MB_IDENT, 1)

      ;;

    euckr)

      AC_DEFINE(HAVE_CHARSET_euckr, 1, [Define to enable charset euckr])

      AC_DEFINE([USE_MB], [1], [Use multi-byte character routines])
@@ -241,10 +251,18 @@ 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"

      ;;

    eucjp_ms)

      default_charset_default_collation="eucjp_ms_japanese_ci"

      default_charset_collations="eucjp_ms_japanese_ci ujis_bin"

      ;;

    euckr)

      default_charset_default_collation="euckr_korean_ci"

      default_charset_collations="euckr_korean_ci euckr_bin"

include/m_ctype.h

+4 −0
Original line number Diff line number Diff line
@@ -230,6 +230,10 @@ 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_eucjp_ms_japanese_ci;

extern CHARSET_INFO my_charset_eucjp_ms_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-czech.lo ctype-cp932.lo ctype-eucjp_ms.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

0 → 100755
+11317 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/ctype_eucjp_ms.result

0 → 100755
+9783 −0

File added.

Preview size limit exceeded, changes collapsed.