1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Folow-up on Bug#37069: fix a valgrind warning

Browse Source 
Don't initalize federated if it's disabled by a command line option.
This commit is contained in:
Georgi Kodinov 2008-07-17 17:33:41 +03:00
parent b8579849f3
commit 5dfdccab24
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/ha_federated.cc
View File

@ -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,