diff options
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 2 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/t/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_2/t/disabled.def | 3 | ||||
| -rw-r--r-- | mysql-test/suite/parts/t/disabled.def | 3 |
4 files changed, 1 insertions, 8 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 4e4f09981cc..5abae272c36 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -135,7 +135,7 @@ our $default_vardir; our $opt_usage; our $opt_suites; -our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run +our $opt_suites_default= "main,binlog,rpl"; # Default suites to run our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_verbose= 0; # Verbose output, enable with --verbose diff --git a/mysql-test/suite/funcs_1/t/disabled.def b/mysql-test/suite/funcs_1/t/disabled.def index 23f15b78103..9bfe9567d83 100644 --- a/mysql-test/suite/funcs_1/t/disabled.def +++ b/mysql-test/suite/funcs_1/t/disabled.def @@ -10,4 +10,3 @@ # ############################################################################## -ndb_trig_1011ext: Bug#47564 diff --git a/mysql-test/suite/funcs_2/t/disabled.def b/mysql-test/suite/funcs_2/t/disabled.def index 8ca94961dd2..8b137891791 100644 --- a/mysql-test/suite/funcs_2/t/disabled.def +++ b/mysql-test/suite/funcs_2/t/disabled.def @@ -1,4 +1 @@ -# Should maybe be enabled, but ndb is not part of the ordinary build. -# Bernt M. Johnsen 2010-05-10 -ndb_charset : Bug#20447 Problem with prefix keys with contractions and expansions diff --git a/mysql-test/suite/parts/t/disabled.def b/mysql-test/suite/parts/t/disabled.def index 8a1dafe59a2..e69de29bb2d 100644 --- a/mysql-test/suite/parts/t/disabled.def +++ b/mysql-test/suite/parts/t/disabled.def @@ -1,3 +0,0 @@ -partition_basic_ndb : Bug#44919 parts-suite in mtr tries to use features not supported by ndb -# http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-limitations-syntax.html -partition_syntax_ndb : Bug#36735 Not supported |