From b0f78ea2780858ef8e4501b40611c20efb9e5f9f Mon Sep 17 00:00:00 2001 From: Venkatesh Duggirala Date: Fri, 8 Feb 2013 16:34:32 +0530 Subject: [PATCH] BUG#16247322-MTR NOT RUNNING SYS_VARS TEST SUITE FOR 5.1 Reverting back the previous changes as they are causing issues in PB2. --- mysql-test/Makefile.am | 3 +-- mysql-test/mysql-test-run.pl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index d3e43996c9f..9cb9ca8a275 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -103,8 +103,7 @@ TEST_DIRS = t r include std_data std_data/parts collections \ suite/engines suite/engines/funcs suite/engines/iuds suite/engines/rr_trx \ suite/engines/funcs/r suite/engines/funcs/t suite/engines/iuds/r \ suite/engines/iuds/t suite/engines/rr_trx/include suite/engines/rr_trx/r \ - suite/engines/rr_trx/t \ - suite/sys_vars + suite/engines/rr_trx/t # Used by dist-hook and install-data-local to copy all # test files into either dist or install directory diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index fbfbd7e2198..bcc43a97cdf 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -157,7 +157,7 @@ my $path_config_file; # The generated config file, var/my.cnf # executables will be used by the test suite. our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; -my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin"; +my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin"; my $opt_suites; our $opt_verbose= 0; # Verbose output, enable with --verbose