summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2006-02-07 19:08:33 +0100
committerunknown <joerg@mysql.com>2006-02-07 19:08:33 +0100
commitcf8dc7312ea2310fbb5abdc0a3649ec592395a07 (patch)
tree9ebe27bf951793b6fc8cd46f9e3da2bc245a5af1
parent4bea025d55314bb1fa734a8b4f012818a9f17d1e (diff)
parent8319717eb00577663c746c58f690b63dff9b04d1 (diff)
downloadmariadb-git-cf8dc7312ea2310fbb5abdc0a3649ec592395a07.tar.gz
Merge mysql.com:/M51/packtool-5.1 into mysql.com:/M51/clone-5.1
-rw-r--r--scripts/make_binary_distribution.sh18
1 files changed, 10 insertions, 8 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 2f59c3e1d4c..b3dfc53f716 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -131,7 +131,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \
storage/myisam/myisamchk$BS storage/myisam/myisampack$BS \
storage/myisam/myisamlog$BS storage/myisam/myisam_ftdump$BS \
- sql/mysqld$BS sql/mysql_tzinfo_to_sql$BS \
+ sql/mysqld$BS sql/mysqld-debug$BS sql/mysql_tzinfo_to_sql$BS \
server-tools/instance-manager/mysqlmanager$BS \
client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \
client/mysqlslap$BS \
@@ -173,8 +173,9 @@ if [ x$STRIP = x1 ] ; then
strip $BASE/bin/*
fi
-# Copy not binary files
-copyfileto $BASE/bin sql/mysqld.sym.gz
+# Obsolete, starting from 5.1.6-beta
+# # Copy not binary files
+# copyfileto $BASE/bin sql/mysqld.sym.gz
if [ $BASE_SYSTEM = "netware" ] ; then
$CP netware/*.pl $BASE/scripts
@@ -304,11 +305,12 @@ else
rm -f $BASE/README.NW
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
+# 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