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

Bug#37069: Make federated disabled by default

Browse Source 
The federated storage engine is now disabled by default.
mysql-test-run.pl is updated to enable it whenever it's required and available.
This commit is contained in:
Georgi Kodinov 2008-05-30 13:21:45 +03:00
parent 4215c0d625
commit bd4c6d9b8c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/lib/mtr_cases.pl
View File

@ -773,6 +773,13 @@ sub collect_one_test_case($$$$$$$$$) {
if ( $::used_default_engine =~ /^innodb/i ); if ( $::used_default_engine =~ /^innodb/i );
} }
#enable federated for this test
if ($tinfo->{'federated_test'})
{
push(@{$tinfo->{'master_opt'}}, "--loose-federated");
push(@{$tinfo->{'slave_opt'}}, "--loose-federated");
}
if ( $tinfo->{'big_test'} and ! $::opt_big_test ) if ( $tinfo->{'big_test'} and ! $::opt_big_test )
{ {
$tinfo->{'skip'}= 1; $tinfo->{'skip'}= 1;
@ -891,6 +898,8 @@ our @tags=
["include/have_ndb_extra.inc", "ndb_extra", 1], ["include/have_ndb_extra.inc", "ndb_extra", 1],
["include/ndb_master-slave.inc", "ndb_test", 1], ["include/ndb_master-slave.inc", "ndb_test", 1],
["require_manager", "require_manager", 1], ["require_manager", "require_manager", 1],
["include/federated.inc", "federated_test", 1],
["include/have_federated_db.inc", "federated_test", 1],
); );
sub mtr_options_from_test_file($$) { sub mtr_options_from_test_file($$) {

5
sql/sql_plugin.cc
View File

@ -1137,9 +1137,10 @@ int plugin_init(int *argc, char **argv, int flags)
{ {
for (plugin= *builtins; plugin->info; plugin++) for (plugin= *builtins; plugin->info; plugin++)
{ {
/* by default, only ndbcluster is disabled */ /* by default, ndbcluster and federated are disabled */
def_enabled= def_enabled=
my_strcasecmp(&my_charset_latin1, plugin->name, "NDBCLUSTER") != 0; my_strcasecmp(&my_charset_latin1, plugin->name, "NDBCLUSTER") != 0 &&
my_strcasecmp(&my_charset_latin1, plugin->name, "FEDERATED") != 0;
bzero(&tmp, sizeof(tmp)); bzero(&tmp, sizeof(tmp));
tmp.plugin= plugin; tmp.plugin= plugin;
tmp.name.str= (char *)plugin->name; tmp.name.str= (char *)plugin->name;