diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 15 | ||||
| -rw-r--r-- | scripts/make_win_src_distribution.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 3 |
3 files changed, 4 insertions, 16 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 4bba4c2420e..aa29d48d50d 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -97,7 +97,7 @@ mkdir $BASE $BASE/bin $BASE/docs \ $BASE/mysql-test/extra/binlog_tests $BASE/mysql-test/extra/rpl_tests if [ $BASE_SYSTEM != "netware" ] ; then - mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \ + mkdir $BASE/share/mysql $BASE/tests $BASE/man \ $BASE/man/man1 $BASE/data $BASE/data/mysql $BASE/data/test chmod o-rwx $BASE/data $BASE/data/* @@ -263,8 +263,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then mv $BASE/support-files/binary-configure $BASE/configure chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* \ $BASE/support-files/mysql.server $BASE/configure - $CP -r sql-bench/* $BASE/sql-bench - rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la + rm -f $BASE/lib/*.la rm -f $BASE/bin/*.sql fi @@ -304,17 +303,9 @@ else rm -f $BASE/README.NW fi -# Dropped with 5.1.6-beta -# # 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 - # Clean up if we did this from a bk tree -if [ -d $BASE/sql-bench/SCCS ] ; then +if [ -d $BASE/share/SCCS ] ; then find $BASE/share -name SCCS -print | xargs rm -rf - find $BASE/sql-bench -name SCCS -print | xargs rm -rf fi # NDB Cluster diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index f9008bdfeae..b070e30c5c7 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -314,7 +314,7 @@ done # Raw dirs from source tree # -for i in scripts sql-bench mysql-test SSL tests +for i in scripts mysql-test SSL tests do print_debug "Copying directory '$i'" if [ -d $i ] diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index c05fda745b0..865ab3e6db4 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -262,9 +262,6 @@ then echo "You can start the MySQL daemon with:" echo "cd @prefix@ ; $bindir/mysqld_safe &" echo - echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:" - echo "cd sql-bench ; perl run-all-tests" - echo fi echo "Please report any problems with the @scriptdir@/mysqlbug script!" echo |