bzr commit into mysql-5.0-bugteam branch (Georgi.Kodinov:2885)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/merge-5.0-bugteam/ based on revid:georgi.kodinov@stripped

 2885 Georgi Kodinov	2010-10-05
      Disable NDB tests to run by default.

    modified:
      mysql-test/lib/mtr_cases.pl
      mysql-test/mysql-test-run-shell.sh
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_cases.pl'
--- a/mysql-test/lib/mtr_cases.pl	2010-06-15 09:00:02 +0000
+++ b/mysql-test/lib/mtr_cases.pl	2010-10-05 08:03:14 +0000
@@ -581,7 +581,7 @@ sub collect_one_test_case($$$$$$$) {
       {
 	# Ndb is not supported, skip it
 	$tinfo->{'skip'}= 1;
-	$tinfo->{'comment'}= "No ndbcluster support";
+	$tinfo->{'comment'}= "No ndbcluster support or ndb tests disabled";
 	return;
       }
       elsif ( $::opt_skip_ndbcluster )

=== modified file 'mysql-test/mysql-test-run-shell.sh'
--- a/mysql-test/mysql-test-run-shell.sh	2007-10-05 17:16:54 +0000
+++ b/mysql-test/mysql-test-run-shell.sh	2010-10-05 08:03:14 +0000
@@ -292,7 +292,8 @@ EXTRA_MYSQLDUMP_OPT=""
 EXTRA_MYSQLSHOW_OPT=""
 EXTRA_MYSQLBINLOG_OPT=""
 USE_RUNNING_SERVER=0
-USE_NDBCLUSTER=@USE_NDBCLUSTER@
+#USE_NDBCLUSTER=@USE_NDBCLUSTER@
+USE_NDBCLUSTER=0
 USE_NDBCLUSTER_ONLY=0
 USE_RUNNING_NDBCLUSTER=""
 USE_PURIFY=""

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-01-27 14:21:41 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-10-05 08:03:14 +0000
@@ -276,8 +276,9 @@ our $opt_stress_test_file=     "";
 
 our $opt_warnings;
 
-our $opt_skip_ndbcluster= 0;
-our $opt_skip_ndbcluster_slave= 0;
+our $opt_skip_ndbcluster= 1;
+our $opt_skip_ndbcluster_slave= 1;
+our $opt_include_ndbcluster= 0;
 our $opt_with_ndbcluster= 0;
 our $opt_with_ndbcluster_only= 0;
 our $glob_ndbcluster_supported= 0;
@@ -537,6 +538,7 @@ sub command_line_setup () {
              'force'                    => \$opt_force,
              'with-ndbcluster-only'     => \$opt_with_ndbcluster_only,
              'skip-ndbcluster|skip-ndb' => \$opt_skip_ndbcluster,
+             'include-ndbcluster'       => \$opt_include_ndbcluster,
              'skip-ndbcluster-slave|skip-ndb-slave'
                                         => \$opt_skip_ndbcluster_slave,
              'ndb-extra-test'           => \$opt_ndb_extra_test,
@@ -2531,6 +2533,11 @@ sub vs_config_dirs ($$) {
 sub check_ndbcluster_support ($) {
   my $mysqld_variables= shift;
 
+  if ($opt_include_ndbcluster)
+  {
+    $opt_skip_ndbcluster= 0;
+  }
+
   if ($opt_skip_ndbcluster || $opt_extern)
   {
     if (!$opt_extern)
@@ -5189,8 +5196,9 @@ Options to control what test suites or c
 
   force                 Continue to run the suite after failure
   with-ndbcluster-only  Run only tests that include "ndb" in the filename
-  skip-ndb[cluster]     Skip all tests that need cluster
+  skip-ndb[cluster]     Skip all tests that need cluster. Default.
   skip-ndb[cluster]-slave Skip all tests that need a slave cluster
+  include-ndb[cluster]  Enable all tests that need cluster
   ndb-extra             Run extra tests from ndb directory
   do-test=PREFIX or REGEX
                         Run test cases which name are prefixed with PREFIX


Attachment: [text/bzr-bundle] bzr/[e-mail]