diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-07-29 13:43:34 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-07-29 13:43:34 +0400 |
| commit | 74214b8635c9373abe6ec8f9e7f5f990d13f9fe9 (patch) | |
| tree | 392482e50ca6ab4d828672da8aa5721919eda571 /scripts | |
| parent | 3c9ba0208ae236435f5bad462b41f0df72aaad28 (diff) | |
| parent | 04d60b389701329d934ed2f7690cc2fd686b9f4a (diff) | |
| download | mariadb-git-74214b8635c9373abe6ec8f9e7f5f990d13f9fe9.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
configure.in:
Auto merged
man/Makefile.am:
Auto merged
mysys/my_bitmap.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/mysqlbinlog.test:
Manual merge.
sql/sql_select.cc:
Manual merge.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index c344cf3e93a..d9e3ea27895 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -96,7 +96,7 @@ mkdir $BASE $BASE/bin $BASE/docs \ if [ $BASE_SYSTEM != "netware" ] ; then mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \ - $BASE/man/man1 $BASE/data $BASE/data/mysql $BASE/data/test + $BASE/man/man1 $BASE/man/man8 $BASE/data $BASE/data/mysql $BASE/data/test chmod o-rwx $BASE/data $BASE/data/* fi @@ -219,6 +219,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then fi if [ -d man ] ; then $CP man/*.1 $BASE/man/man1 + $CP man/*.8 $BASE/man/man8 fi fi @@ -309,7 +310,6 @@ else fi # Make safe_mysqld a symlink to mysqld_safe for backwards portability -# To be removed in MySQL 4.1 if [ $BASE_SYSTEM != "netware" ] ; then (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld ) fi |