summaryrefslogtreecommitdiff
path: root/mysql-test/Makefile.am
diff options
context:
space:
mode:
authortnurnberg@sin.intern.azundris.com <>2007-09-15 05:12:02 +0200
committertnurnberg@sin.intern.azundris.com <>2007-09-15 05:12:02 +0200
commitf3b1822c7a086b18e1456e9e3bd19d7a9eae710c (patch)
treedac824d5a046aa0ae331c72bd20721e861592563 /mysql-test/Makefile.am
parentf26d69e01a6ffbae92c202c800981e1b102e0eda (diff)
parentcc3f0af2e199487c8b2cebd6c7b525168ad5a7a7 (diff)
downloadmariadb-git-f3b1822c7a086b18e1456e9e3bd19d7a9eae710c.tar.gz
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/tnurnberg/15327/51-15327
Diffstat (limited to 'mysql-test/Makefile.am')
-rw-r--r--mysql-test/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index e1b0f29e253..2dab015cde2 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -147,6 +147,7 @@ SUFFIXES = .sh
-e 's!@''PERL''@!@PERL@!' \
-e 's!@''VERSION''@!@VERSION@!' \
-e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
+ -e 's!@''MYSQL_TCP_PORT_DEFAULT''@!@MYSQL_TCP_PORT_DEFAULT@!' \
-e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
-e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
-e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \