mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1 configure.in: Auto merged libmysqld/lib_sql.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/lex.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_repl.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged
This commit is contained in:
commit
97cd4fb127
54 changed files with 2159 additions and 843 deletions
|
|
@ -2401,7 +2401,11 @@ done
|
|||
|
||||
dnl Always compile latin1
|
||||
AC_DEFINE(HAVE_CHARSET_latin1)
|
||||
|
||||
|
||||
dnl Always compile utf8
|
||||
AC_DEFINE(HAVE_CHARSET_utf8)
|
||||
use_mb=yes
|
||||
|
||||
if test "$use_mb" = "yes"
|
||||
then
|
||||
AC_DEFINE(USE_MB)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue