From: Date: July 28 2006 11:12pm
Subject: bk commit into 4.0 tree (kent:1.2191) BUG#21220
List-Archive: http://lists.mysql.com/commits/9740
X-Bug: 21220
Message-Id: <20060728211246.155B3D8697B@c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se>

Below is the list of changes that have just been committed into a local
4.0 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:12:40+02:00, kent@stripped +2 -0
  Makefile.am, configure.in:
    Man page for mysqld command move to section 8 (bug#21220)

  configure.in@stripped, 2006-07-28 23:10:45+02:00, kent@stripped +4 -0
    Man page for mysqld command move to section 8 (bug#21220)

  man/Makefile.am@stripped, 2006-07-28 23:10:45+02:00, kent@stripped +2 -1
    Man page for mysqld command move to section 8 (bug#21220)

# 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.0

--- 1.336/configure.in	2006-07-28 23:12:45 +02:00
+++ 1.337/configure.in	2006-07-28 23:12:45 +02:00
@@ -2218,12 +2218,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.10/man/Makefile.am	2006-07-28 23:12:46 +02:00
+++ 1.11/man/Makefile.am	2006-07-28 23:12:46 +02:00
@@ -18,7 +18,8 @@
 ## Process this file with automake to create Makefile.in
 
 man1_MANS =   @man1_files@
-EXTRA_DIST =  $(man1_MANS)
+man8_MANS =   @man8_files@
+EXTRA_DIST =  $(man1_MANS) $(man8_MANS)
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%