diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-07 09:39:38 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-07 09:39:38 +0200 |
| commit | 526488f1430a5dbf664c13705754d8a07ac7ea3d (patch) | |
| tree | e1518354f45ac0211da1affa7261c302072a338c /config | |
| parent | 94814c6f5d1b50cdaa3e1eb3099d414ae51517b0 (diff) | |
| parent | 8628f2c8614cecdbd12555d84d14d8027be1bee5 (diff) | |
| download | mariadb-git-526488f1430a5dbf664c13705754d8a07ac7ea3d.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ha_federated.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ac-macros/ha_federated.m4 b/config/ac-macros/ha_federated.m4 index 4383a9d8d55..5c991f31666 100644 --- a/config/ac-macros/ha_federated.m4 +++ b/config/ac-macros/ha_federated.m4 @@ -6,7 +6,7 @@ AC_DEFUN([MYSQL_CHECK_FEDERATED], [ AC_ARG_WITH([federated-storage-engine], [ --with-federated-storage-engine - Enable the MySQL Storage Engine], + Enable the MySQL Federated Storage Engine], [federateddb="$withval"], [federateddb=no]) AC_MSG_CHECKING([for MySQL federated storage engine]) |