mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
This commit is contained in:
unknown 2005-03-07 14:19:45 +01:00
commit 7e3eef4e9e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/Makefile.am
View file

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

2
mysql-test/mysql-test-run.sh
View file

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