Commit 41659299 authored by Mattias Jonsson's avatar Mattias Jonsson
Browse files

auto merge

parents 3345a715 f20f1a3c

mysql-test/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(distdir)/std_data/ndb_backup51_data_be

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le

	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts

	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/*.txt $(distdir)/std_data/funcs_1

	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My

	-rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock
@@ -132,7 +132,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le

	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts

	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/*.txt $(DESTDIR)$(testdir)/std_data/funcs_1

	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(DESTDIR)$(testdir)/std_data/funcs_1

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My

	for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \

mysql-test/lib/mtr_cases.pl

+9 −0
Original line number Diff line number Diff line
@@ -773,6 +773,13 @@ sub collect_one_test_case($$$$$$$$$) { 
	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 )

    {

      $tinfo->{'skip'}= 1;
@@ -891,6 +898,8 @@ our @tags= 
 ["include/have_ndb_extra.inc", "ndb_extra", 1],

 ["include/ndb_master-slave.inc", "ndb_test", 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($$) {

sql/sql_plugin.cc

+3 −2
Original line number Diff line number Diff line
@@ -1137,9 +1137,10 @@ int plugin_init(int *argc, char **argv, int flags) 
  {

    for (plugin= *builtins; plugin->info; plugin++)

    {

      /* by default, only ndbcluster is disabled */

      /* by default, ndbcluster and federated are disabled */

      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));

      tmp.plugin= plugin;

      tmp.name.str= (char *)plugin->name;