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

Bug#37069 (5.0): implement --skip-federated

Browse Source 
mysql-test/r/federated_disabled.result:
  Bug#37069 (5.0): test case
mysql-test/t/federated_disabled-master.opt:
  Bug#37069 (5.0): test case
mysql-test/t/federated_disabled.test:
  Bug#37069 (5.0): test case
This commit is contained in:
Georgi Kodinov 2008-06-03 13:12:37 +03:00
parent e981dd6215
commit da4cfa6d1e
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
mysql-test/r/federated_disabled.result Normal file
View File

1
mysql-test/t/federated_disabled-master.opt Normal file
View File

@ -0,0 +1 @@
--skip-federated

3
mysql-test/t/federated_disabled.test Normal file
View File

@ -0,0 +1,3 @@
source include/federated.inc;
SHOW VARIABLES LIKE 'have_federated_engine';

16
sql/mysqld.cc
View File

@ -328,7 +328,7 @@ static bool lower_case_table_names_used= 0;
static bool volatile select_thread_in_use, signal_thread_in_use; static bool volatile select_thread_in_use, signal_thread_in_use;
static bool volatile ready_to_exit; static bool volatile ready_to_exit;
static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0; static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
static my_bool opt_bdb, opt_isam, opt_ndbcluster, opt_merge; static my_bool opt_bdb, opt_isam, opt_ndbcluster, opt_merge, opt_federated;
static my_bool opt_short_log_format= 0; static my_bool opt_short_log_format= 0;
static uint kill_cached_threads, wake_thread; static uint kill_cached_threads, wake_thread;
static ulong killed_threads, thread_created; static ulong killed_threads, thread_created;
@ -4989,7 +4989,8 @@ enum options_mysqld
OPT_INNODB_ROLLBACK_ON_TIMEOUT, OPT_INNODB_ROLLBACK_ON_TIMEOUT,
OPT_SECURE_FILE_PRIV, OPT_SECURE_FILE_PRIV,
OPT_KEEP_FILES_ON_CREATE, OPT_KEEP_FILES_ON_CREATE,
OPT_INNODB_ADAPTIVE_HASH_INDEX OPT_INNODB_ADAPTIVE_HASH_INDEX,
OPT_FEDERATED
}; };
@ -5175,6 +5176,9 @@ Disable with --skip-external-locking.",
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"flush", OPT_FLUSH, "Flush tables to disk between SQL commands.", 0, 0, 0, {"flush", OPT_FLUSH, "Flush tables to disk between SQL commands.", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"federated", OPT_FEDERATED, "Enable Federated storage engine. Disable with \
--skip-federated.",
(gptr*) &opt_federated, (gptr*) &opt_federated, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
/* We must always support the next option to make scripts like mysqltest /* We must always support the next option to make scripts like mysqltest
easier to do */ easier to do */
{"gdb", OPT_DEBUGGING, {"gdb", OPT_DEBUGGING,
@ -7322,6 +7326,14 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
else else
have_merge_db= SHOW_OPTION_DISABLED; have_merge_db= SHOW_OPTION_DISABLED;
break; break;
#ifdef HAVE_FEDERATED_DB
case OPT_FEDERATED:
if (opt_federated)
have_federated_db= SHOW_OPTION_YES;
else
have_federated_db= SHOW_OPTION_DISABLED;
break;
#endif
#ifdef HAVE_BERKELEY_DB #ifdef HAVE_BERKELEY_DB
case OPT_BDB_NOSYNC: case OPT_BDB_NOSYNC:
/* Deprecated option */ /* Deprecated option */