From a811cc0a88f4c1a336e68564008a0b4b9a7076d9 Mon Sep 17 00:00:00 2001
From: unknown
 <kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se>
Date: Fri, 28 Jul 2006 22:57:57 +0200
Subject: [PATCH 1/3] mysql.spec.sh:   Man page for "mysqld" command move to
 section 8 (bug#21220)

support-files/mysql.spec.sh:
  Man page for "mysqld" command move to section 8 (bug#21220)
---
 support-files/mysql.spec.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 5796e776b83..2958e857049 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -444,7 +444,7 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
 %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/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*

From 6f65bffebd8dafaf7a38d2e44ec42f2c3de1b851 Mon Sep 17 00:00:00 2001
From: unknown
 <kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se>
Date: Fri, 28 Jul 2006 23:06:49 +0200
Subject: [PATCH 2/3] make_binary_distribution.sh:   Man page for "mysqld"
 command move to section 8 (bug#21220)

scripts/make_binary_distribution.sh:
  Man page for "mysqld" command move to section 8 (bug#21220)
---
 scripts/make_binary_distribution.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 396c4f83bac..ae24752d290 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -70,7 +70,7 @@ mkdir $BASE $BASE/bin $BASE/docs \
 
 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
@@ -198,6 +198,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then
   fi
   if [ -d man ] ; then
     $CP man/*.1 $BASE/man/man1
+    $CP man/*.8 $BASE/man/man8
   fi
 fi
 
@@ -255,7 +256,6 @@ else
 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

From d1fde0f7f5139e28731f1138c7473c8686ee9a45 Mon Sep 17 00:00:00 2001
From: unknown
 <kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se>
Date: Fri, 28 Jul 2006 23:12:40 +0200
Subject: [PATCH 3/3] Makefile.am, configure.in:   Man page for mysqld command
 move to section 8 (bug#21220)

configure.in:
  Man page for mysqld command move to section 8 (bug#21220)
man/Makefile.am:
  Man page for mysqld command move to section 8 (bug#21220)
---
 configure.in    | 4 ++++
 man/Makefile.am | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 376cf48c476..57993fa29a1 100644
--- a/configure.in
+++ b/configure.in
@@ -2218,12 +2218,16 @@ then
   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,
diff --git a/man/Makefile.am b/man/Makefile.am
index 9702c4b2ace..5753259fd3d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -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.%