diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-10-10 14:15:09 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-10-10 14:15:09 -0600 |
| commit | 17c19299afd94a4f97f2cad0dd71d25299e56206 (patch) | |
| tree | 0c7021abce949f66539e39f9be638cd713ae31b6 /scripts/Makefile.am | |
| parent | 03bef972d3b508013cfcad2de294569ecdf16158 (diff) | |
| parent | 5597f40f7f6edf7eb1f9c8d4b14000e041f68944 (diff) | |
| download | mariadb-git-17c19299afd94a4f97f2cad0dd71d25299e56206.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
configure.in:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/sql_select.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index fed96490397..6143c3532d9 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -169,6 +169,7 @@ SUFFIXES = .sh -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \ -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \ -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \ + -e 's!@''MYSQL_TCP_PORT_DEFAULT''@!@MYSQL_TCP_PORT_DEFAULT@!' \ -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \ -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ |