diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-12-28 01:07:42 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-12-28 01:07:42 +0100 |
| commit | 1e41f36c5671df879062d1ea52c8b57b6fc2d44f (patch) | |
| tree | 0ab730bd3b7113ed9014fb03493aed86622e6606 /scripts/Makefile.am | |
| parent | c8f6457f650845ab1f9e04b2136b8351e4d465aa (diff) | |
| parent | 471437fd47bc10ce89b290c46ffcbb260aaa12f4 (diff) | |
| download | mariadb-git-1e41f36c5671df879062d1ea52c8b57b6fc2d44f.tar.gz | |
Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-build
into mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build
extra/CMakeLists.txt:
Auto merged
extra/resolveip.c:
Auto merged
scripts/CMakeLists.txt:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/make_win_bin_dist:
Auto merged
scripts/mysql_convert_table_format.sh:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
Auto merged
BitKeeper/deleted/.del-mysql_tableinfo.sh~c715458838a2a818:
Auto merged
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index fc4359fd872..4e1daf89a2c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -43,9 +43,11 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \ make_sharedlib_distribution.sh \ msql2mysql.sh \ mysql_config.sh \ + mysql_config.pl.in \ mysql_fix_privilege_tables.sh \ mysql_fix_extensions.sh \ mysql_install_db.sh \ + mysql_install_db.pl.in \ mysql_setpermission.sh \ mysql_secure_installation.sh \ mysql_zap.sh \ |