diff options
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 07ae10b2b07..a63b4cbf178 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -17,18 +17,8 @@ ## Process this file with automake to create Makefile.in -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) testdir = $(benchdir_root)/mysql-test @@ -129,7 +119,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' \ + -e 's!@''USE_NDBCLUSTER''@!@TEST_NDBCLUSTER@!g' \ $< > $@-t @CHMOD@ +x $@-t @MV@ $@-t $@ |