diff options
| author | Kristofer Pettersson <kpettersson@mysql.com> | 2008-07-21 12:24:31 +0200 |
|---|---|---|
| committer | Kristofer Pettersson <kpettersson@mysql.com> | 2008-07-21 12:24:31 +0200 |
| commit | 6da6bbc75e03c2fbd66600d679a089cb6d128ba7 (patch) | |
| tree | dc0b53ceb6090237af2cfc078b806f223ebc26aa /sql | |
| parent | b7d4c76a54876f5e2aac4d30e171db2cff91dd04 (diff) | |
| parent | 88d66418c8fb2fbd6b60968d1ad8962b2af56232 (diff) | |
| download | mariadb-git-6da6bbc75e03c2fbd66600d679a089cb6d128ba7.tar.gz | |
Auto merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_federated.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 2ccfeba74cb..9ce5d44534e 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -405,6 +405,9 @@ static byte *federated_get_key(FEDERATED_SHARE *share, uint *length, bool federated_db_init() { DBUG_ENTER("federated_db_init"); + /* the federated engine can be disabled by a command line option */ + if (have_federated_db == SHOW_OPTION_DISABLED) + DBUG_RETURN(TRUE); if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST)) goto error; if (hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0, |