Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

mysql-test/Makefile.am

@@ -20,12 +20,14 @@
 if HAVE_NDBCLUSTER_DB
 SUBDIRS = ndb
 DIST_SUBDIRS=ndb
+USE_NDBCLUSTER=\"--ndbcluster\"
 else
 # If one uses automake conditionals, automake will automatically
 # include all possible branches to DIST_SUBDIRS goal.
 # Reset DIST_SUBDIRS if we don't use NDB
 SUBDIRS=
 DIST_SUBDIRS=
+USE_NDBCLUSTER=\"\"
 endif
 
 benchdir_root=		$(prefix)
@@ -98,6 +100,7 @@ SUFFIXES = .sh
 	  -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
 	  -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
 	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
+	  -e 's!@''USE_NDBCLUSTER''@!$(USE_NDBCLUSTER)!g' \
 	  $< > $@-t
 	@CHMOD@ +x $@-t
 	@MV@ $@-t $@

mysql-test/mysql-test-run.sh

@@ -218,7 +218,7 @@ EXTRA_MYSQL_TEST_OPT=""
 EXTRA_MYSQLDUMP_OPT=""
 EXTRA_MYSQLBINLOG_OPT=""
 USE_RUNNING_SERVER=""
-USE_NDBCLUSTER=""
+USE_NDBCLUSTER=@USE_NDBCLUSTER@
 USE_RUNNING_NDBCLUSTER=""
 USE_PURIFY=""
 PURIFY_LOGS=""