Commit 430aaacd authored by Georgi Kodinov's avatar Georgi Kodinov

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.
parent 95ca2c6d
...@@ -405,6 +405,9 @@ static byte *federated_get_key(FEDERATED_SHARE *share, uint *length, ...@@ -405,6 +405,9 @@ static byte *federated_get_key(FEDERATED_SHARE *share, uint *length,
bool federated_db_init() bool federated_db_init()
{ {
DBUG_ENTER("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)) if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
goto error; goto error;
if (hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0, if (hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment