diff options
| author | unknown <monty@mysql.com> | 2004-07-12 08:20:24 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-12 08:20:24 +0300 |
| commit | 677d60bc61a36be16af964eaae47cc88b0ecc33f (patch) | |
| tree | 4b4523bbabccb4e51b85fc209e3274f249f85ef8 /configure.in | |
| parent | c4645f84047585b12523d8d111044bf040880bb4 (diff) | |
| parent | 18d974a3e7b48eec96c8837d42ebbc698e68ca55 (diff) | |
| download | mariadb-git-677d60bc61a36be16af964eaae47cc88b0ecc33f.tar.gz | |
Merge with 4.1
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/opt_range.cc:
Merge with 4.1
true -> TRUE and false -> FALSE
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 8abd0a0908c..9ac4aaedfbe 100644 --- a/configure.in +++ b/configure.in @@ -521,7 +521,7 @@ fi AC_SUBST(CHECK_PID) AC_MSG_RESULT("$CHECK_PID") -# We need a ANSI C compiler +# We need an ANSI C compiler AM_PROG_CC_STDC # We need an assembler, too @@ -529,7 +529,7 @@ AM_PROG_AS if test "$am_cv_prog_cc_stdc" = "no" then - AC_MSG_ERROR([MySQL requires a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.]) + AC_MSG_ERROR([MySQL requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.]) fi NOINST_LDFLAGS= @@ -2527,7 +2527,7 @@ done case $default_charset in armscii8) default_charset_default_collation="armscii8_general_ci" - default_charset_collations="armscii8_general_ci armscii_bin" + default_charset_collations="armscii8_general_ci armscii8_bin" ;; ascii) default_charset_default_collation="ascii_general_ci" |