bk commit into 4.1 tree (kent:1.2529)

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent 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@stripped, 2006-07-28 23:40:05+02:00, kent@stripped +3 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
  into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
  MERGE: 1.1346.1.845

  configure.in@stripped, 2006-07-28 23:39:21+02:00, kent@stripped +0 -0
    Auto merged
    MERGE: 1.191.1.146

  scripts/make_binary_distribution.sh@stripped, 2006-07-28 23:39:21+02:00, kent@stripped +0
-0
    Auto merged
    MERGE: 1.49.1.15

  support-files/mysql.spec.sh@stripped, 2006-07-28 23:40:01+02:00, kent@stripped +0 -0
    SCCS merged
    MERGE: 1.61.1.37

# 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:	kent
# Host:	c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-4.1/RESYNC

--- 1.414/configure.in	2006-07-28 23:40:15 +02:00
+++ 1.415/configure.in	2006-07-28 23:40:15 +02:00
@@ -2380,12 +2380,16 @@
   man_dirs="man"
   man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
   man1_files=`echo $man1_files`
+  man8_files=`ls -8 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`
+  man8_files=`echo $man8_files`
 else
   man_dirs=""
   man1_files=""
+  man8_files=""
 fi
 AC_SUBST(man_dirs)
 AC_SUBST(man1_files)
+AC_SUBST(man8_files)
 
 # Shall we build the bench code?
 AC_ARG_WITH(bench,

--- 1.93/scripts/make_binary_distribution.sh	2006-07-28 23:40:16 +02:00
+++ 1.94/scripts/make_binary_distribution.sh	2006-07-28 23:40:16 +02:00
@@ -80,7 +80,7 @@
 
 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
@@ -203,6 +203,7 @@
   fi
   if [ -d man ] ; then
     $CP man/*.1 $BASE/man/man1
+    $CP man/*.8 $BASE/man/man8
   fi
 fi
 
@@ -287,7 +288,6 @@
 fi
 
 # Make safe_mysqld a symlink to mysqld_safe for backwards portability
-# To be removed in MySQL 4.1
 (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )
 
 # Clean up if we did this from a bk tree

--- 1.122/support-files/mysql.spec.sh	2006-07-28 23:40:16 +02:00
+++ 1.123/support-files/mysql.spec.sh	2006-07-28 23:40:16 +02:00
@@ -546,7 +546,7 @@
 %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
 %doc %attr(644, root, man) %{_mandir}/man1/myisampack.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_explain_log.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqld.1*
+%doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*