diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2005-03-07 14:19:45 +0100 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2005-03-07 14:19:45 +0100 |
| commit | be615b4a9b2961cb7c016db015d41463dfcf89d4 (patch) | |
| tree | 21ab4a1d0712fd2a24cb7e2c99ad9aced042da13 /mysql-test | |
| parent | f4dc811e67295a2f3603eea576e4d420ff015b1f (diff) | |
| parent | f5e9b79c28284774a0c126670916ba247a7c4753 (diff) | |
| download | mariadb-git-be615b4a9b2961cb7c016db015d41463dfcf89d4.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/Makefile.am | 3 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 9426b20d09c..b2e86d8c00e 100644 --- a/mysql-test/Makefile.am +++ b/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 $@ diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 8c484d2ddb1..0562a15bd40 100644 --- a/mysql-test/mysql-test-run.sh +++ b/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="" |