diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-07-17 17:33:41 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-07-17 17:33:41 +0300 |
| commit | 430aaacdaf7405946c3b447e58316a9871113c14 (patch) | |
| tree | 4c251b0dc0e978a71a732fbe14daef4732c1da96 /sql | |
| parent | 95ca2c6d96735edac951bd3b6995847e3ad03536 (diff) | |
| download | mariadb-git-430aaacdaf7405946c3b447e58316a9871113c14.tar.gz | |
Folow-up on Bug#37069: fix a valgrind warning
Don't initalize federated if it's disabled by a command line option.
sql/ha_federated.cc:
Folow-up on Bug#37069: Don't initalize federated if it's disabled
by a command line option.
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, |