bk commit into 5.1 tree (joerg:1.2132)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2132 06/02/07 19:06:55 joerg@stripped +1 -0
  scripts/make_binary_distribution.sh  :  Care about the debug server in the 5.1 packages.

  scripts/make_binary_distribution.sh
    1.108 06/02/07 19:06:49 joerg@stripped +10 -8
    As of 5.1, any package will contain both an optimized and a debugging server,
    built with identical configuration (features / table handlers).
    This "mysqld-debug" must be contained in the package.
    Also, the server will not be stripped any more.
    Also, get rid of the old compatibility symlink "safe_mysqld" dating back to 4.0.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M51/packtool-5.1

--- 1.107/scripts/make_binary_distribution.sh	2006-02-07 17:41:58 +01:00
+++ 1.108/scripts/make_binary_distribution.sh	2006-02-07 19:06:49 +01:00
@@ -131,7 +131,7 @@
   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 @@
   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 @@
     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