Commit 222a0254 authored by unknown's avatar unknown

Add latin1_de character set, and make it the default.


sql/share/charsets/Index:
  Add latin1_de character set.
parent 0cf6786c
...@@ -1814,23 +1814,23 @@ fi ...@@ -1814,23 +1814,23 @@ fi
AC_SUBST(readline_dir) AC_SUBST(readline_dir)
AC_SUBST(readline_link) AC_SUBST(readline_link)
# Choose a character set dnl In order to add new charset, you must add charset name to
dnl in order to add new charset, you must add charset name to dnl this CHARSETS_AVAILABLE list and sql/share/charsets/Index.
dnl CHARSETS_AVAILABLE list and add the charset name to dnl If the character set uses strcoll or other special handling,
dnl sql/share/charsets/Index. If the character set uses strcoll dnl you must also create strings/ctype-$charset_name.c
dnl or other special handling, you must also create
dnl strings/ctype-$charset_name.c
CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 latin5 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620" AC_DIVERT_PUSH(AC_DIVERSION_INIT)
DEFAULT_CHARSET=latin1 CHARSETS_AVAILABLE="big5 cp1251 cp1257
dnl win1251 is deprecated - it's available, but not listed here in the help
AC_ARG_WITH(charset,
[ --with-charset=CHARSET Use CHARSET by default (one of: big5 cp1251 cp1257
croat czech danish dec8 dos estonia euc_kr gb2312 gbk croat czech danish dec8 dos estonia euc_kr gb2312 gbk
german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr
latin1 latin2 latin5 swe7 usa7 win1250 win1251ukr latin1 latin1_de latin2 latin5 sjis swe7 tis620 ujis
ujis sjis tis620; Default is latin1)], usa7 win1250 win1251ukr"
CHARSETS_DEPRECATED="win1251"
DEFAULT_CHARSET=latin1_de
AC_DIVERT_POP
AC_ARG_WITH(charset,
[ --with-charset=CHARSET Use CHARSET by default (one of: $CHARSETS_AVAILABLE; Default is $DEFAULT_CHARSET)],
[default_charset="$withval"], [default_charset="$withval"],
[default_charset="$DEFAULT_CHARSET"]) [default_charset="$DEFAULT_CHARSET"])
...@@ -1851,7 +1851,7 @@ elif test "$extra_charsets" = complex; then ...@@ -1851,7 +1851,7 @@ elif test "$extra_charsets" = complex; then
CHARSETS=`echo $CHARSETS` # get rid of line breaks CHARSETS=`echo $CHARSETS` # get rid of line breaks
else else
if test "$extra_charsets" = all; then if test "$extra_charsets" = all; then
CHARSETS="$CHARSETS_AVAILABLE" CHARSETS="$CHARSETS_AVAILABLE $CHARSETS_DEPRECATED"
else else
CHARSETS=`echo $extra_charsets | sed -e 's/,/ /g'` CHARSETS=`echo $extra_charsets | sed -e 's/,/ /g'`
fi fi
...@@ -1872,7 +1872,7 @@ CHARSETS=$TMP_CHARSETS ...@@ -1872,7 +1872,7 @@ CHARSETS=$TMP_CHARSETS
for cs in $CHARSETS for cs in $CHARSETS
do do
charset_okay=0 charset_okay=0
for charset in $CHARSETS_AVAILABLE for charset in $CHARSETS_AVAILABLE $CHARSETS_DEPRECATED
do do
if test $cs = $charset; then charset_okay=1; fi if test $cs = $charset; then charset_okay=1; fi
done done
......
# sql/share/charsets/Index # sql/share/charsets/Index
# #
# This file lists all of the available character sets. # This file lists all of the available character sets. Please keep this
# file sorted by character set number.
big5 1 big5 1
...@@ -34,3 +35,4 @@ croat 27 ...@@ -34,3 +35,4 @@ croat 27
gbk 28 gbk 28
cp1257 29 cp1257 29
latin5 30 latin5 30
latin1_de 31
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment