mirror of
https://github.com/MariaDB/server.git
synced 2025-11-03 14:33:32 +03:00
bee9933ab8
support-files/mysql.server-sys5.sh: Change mode to -rw-rw-r-- Docs/manual.texi: Added information about BeOS, Access 2000, AIX and user links client/mysql.cc: Fixed SOURCE to work on windows client/mysqldump.c: Strip of white space configure.in: Fix for AIX include/dbug.h: Assert handling include/my_pthread.h: Ia64 needs more thread stack than other processors include/my_sys.h: More comments myisam/mi_key.c: Fixed wrong key length checks mysql.proj: update mysys/charset.c: Cleanup mysys/mf_keycache.c: Moved SEC_LINK to file that used it mysys/my_static.h: Moved SEC_LINK to file that used it scripts/Makefile.am: Fix for debian scripts/mysql_install_db.sh: Cleanup sql/gen_lex_hash.cc: Better values sql/ha_berkeley.cc: Fix of reading of unique key sql/handler.cc: Fix memory allocation bug sql/mysqld.cc: Fix for Ia64 sql/share/charsets/latin1.conf: Fixed sortorder back to scandinavian. sql/sql_yacc.yy: FULL shouldn't be a keyword support-files/Makefile.am: Fix for debian support-files/mysql.server.sh: Cleanups
40 lines
2.3 KiB
Plaintext
40 lines
2.3 KiB
Plaintext
--- mysql-3.23.23.orig/configure
|
|
+++ mysql-3.23.23/configure
|
|
@@ -202,7 +202,7 @@
|
|
--with-charset=CHARSET use CHARSET by default (one of: big5 cp1251 cp1257
|
|
croat czech danish dec8 dos estonia euc_kr gb2312 gbk
|
|
german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr
|
|
- latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr
|
|
+ latin1 latin2 swe7 usa7 win1250 win1251ukr
|
|
ujis sjis tis620; default is latin1)"
|
|
ac_help="$ac_help
|
|
--with-extra-charsets=cs1,cs2
|
|
@@ -8843,7 +8843,7 @@
|
|
|
|
# Choose a character set
|
|
|
|
-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 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620"
|
|
+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 swe7 usa7 win1250 win1251ukr ujis sjis tis620"
|
|
DEFAULT_CHARSET=latin1
|
|
|
|
# Check whether --with-charset or --without-charset was given.
|
|
--- mysql-3.23.23.orig/configure.in
|
|
+++ mysql-3.23.23/configure.in
|
|
@@ -1517,14 +1517,14 @@
|
|
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 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620"
|
|
+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 swe7 usa7 win1250 win1251ukr ujis sjis tis620"
|
|
DEFAULT_CHARSET=latin1
|
|
|
|
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
|
|
german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr
|
|
- latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr
|
|
+ latin1 latin2 swe7 usa7 win1250 win1251ukr
|
|
ujis sjis tis620; default is latin1)],
|
|
[default_charset="$withval"],
|
|
[default_charset="$DEFAULT_CHARSET"])
|