diff options
author | unknown <df@pippilotta.erinye.com> | 2008-01-02 22:26:41 +0100 |
---|---|---|
committer | unknown <df@pippilotta.erinye.com> | 2008-01-02 22:26:41 +0100 |
commit | 7b26e7774c9ed4a508e48a953d80fe722fe68e2a (patch) | |
tree | bfc96a662b5b411520437e3053f8a07be391029e /scripts/Makefile.am | |
parent | 7a05caf27ed29fe4e86b9125ccdd09ee8a55fba9 (diff) | |
parent | 7e656539834bcb41107f05d84929f875939f64f5 (diff) | |
download | mariadb-git-7b26e7774c9ed4a508e48a953d80fe722fe68e2a.tar.gz |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
scripts/CMakeLists.txt:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/make_win_bin_dist:
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 4e1daf89a2c..b61b614598d 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -50,6 +50,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \ mysql_install_db.pl.in \ mysql_setpermission.sh \ mysql_secure_installation.sh \ + mysql_secure_installation.pl.in \ mysql_zap.sh \ mysqlaccess.sh \ mysqlbug.sh \ |