diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 04:09:38 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 04:09:38 +0200 |
| commit | 682c22846fe5aaf35762a21daf2ba29162b1fc4c (patch) | |
| tree | e53fd604dfbb3db1190c5c65e2a83a9faa64e25c /mysql-test/Makefile.am | |
| parent | 866225919c303f36e83b6af10e3908bcb39bda62 (diff) | |
| parent | ee7f125d5f42fd653cb09cf5b15ae9384b7d9248 (diff) | |
| download | mariadb-git-682c22846fe5aaf35762a21daf2ba29162b1fc4c.tar.gz | |
Merge mysql.com:/home/tnurnberg/15327/50-15327
into mysql.com:/home/tnurnberg/15327/51-15327
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
Auto merged
BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6:
Auto merged
client/mysql_upgrade.c:
Auto merged
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
netware/mysql_test_run.c:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
server-tools/instance-manager/priv.h:
Auto merged
client/mysql.cc:
manual merge
client/mysqladmin.cc:
manual merge
client/mysqlbinlog.cc:
manual merge
client/mysqlcheck.c:
manual merge
client/mysqldump.c:
manual merge
client/mysqlimport.c:
manual merge
client/mysqlshow.c:
manual merge
client/mysqltest.c:
manual merge
sql/mysqld.cc:
manual merge
tests/mysql_client_test.c:
manual merge
tests/thread_test.c:
manual merge
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index acb9ba36bda..2a7a75daa4d 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -150,6 +150,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@!' \ |