diff options
| author | unknown <tsmith@sita.local> | 2007-09-24 11:33:27 +0200 |
|---|---|---|
| committer | unknown <tsmith@sita.local> | 2007-09-24 11:33:27 +0200 |
| commit | 139b563ec40f21387de56d2848934a1d684fbe7f (patch) | |
| tree | 766c9579cf8ea7c94942af2e5f5929d563f313ea /mysql-test/Makefile.am | |
| parent | ad57f91294e80016af10f282202fa5abb788bdc9 (diff) | |
| parent | cfbb6fc63255dadb92af18546fa7ebe8d91aa870 (diff) | |
| download | mariadb-git-139b563ec40f21387de56d2848934a1d684fbe7f.tar.gz | |
Merge sita.local:/Users/tsmith/m/bk/50
into sita.local:/Users/tsmith/m/bk/maint/50
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/sql_select.cc:
Auto merged
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 cbc3e754312..75d00457d14 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -139,6 +139,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@!' \ |