bk commit into 5.0 tree (tomas:1.1915) BUG#11903

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1915 05/07/13 13:07:09 tomas@stripped +1 -0
  Bug #11903, make perl test script run ndbcluster tests by default

  mysql-test/mysql-test-run.pl
    1.31 05/07/13 13:07:02 tomas@stripped +24 -0
    Bug #11903, make perl test script run ndbcluster tests by default

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0

--- 1.30/mysql-test/mysql-test-run.pl	2005-07-06 22:29:23 +02:00
+++ 1.31/mysql-test/mysql-test-run.pl	2005-07-13 13:07:02 +02:00
@@ -287,6 +287,7 @@
 sub environment_setup ();
 sub kill_running_server ();
 sub kill_and_cleanup ();
+sub ndbcluster_support ();
 sub ndbcluster_install ();
 sub ndbcluster_start ();
 sub ndbcluster_stop ();
@@ -319,6 +320,12 @@
   initial_setup();
   command_line_setup();
   executable_setup();
+  
+  if (! $opt_skip_ndbcluster and ! $opt_with_ndbcluster)
+  {
+    $opt_with_ndbcluster= ndbcluster_support();
+  }
+
   environment_setup();
   signal_setup();
 
@@ -1025,6 +1032,23 @@
 #  Start the ndb cluster
 #
 ##############################################################################
+
+sub ndbcluster_support () {
+
+  # check ndbcluster support by testing using a switch
+  # that is only available in that case
+  if ( mtr_run($exe_mysqld,
+	       ["--no-defaults",
+	        "--ndb-use-exact-count",
+	        "--help"],
+	       "", "/dev/null", "/dev/null", "") != 0 )
+  {
+    mtr_report("No ndbcluster support");
+    return 0;
+  }
+  mtr_report("Has ndbcluster support");
+  return 1;
+}
 
 # FIXME why is there a different start below?!