Below is the list of changes that have just been committed into a local
4.0 repository of mysqldev. When mysqldev 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.2169 05/10/27 14:51:58 lenz@stripped +18 -0
- Removed obsolete and outdated man page files from the man
directory - these files are now maintained in the mysqldoc
repository and included in the source distribution during the
release build. Updated the configure.in script and Makefiles to
create the man page file list at build time
- Updated the file list in the RPM spec file to include all currently
available man pages (this can not be done with wildcards, as
the man pages are spread across several subpackages. However, RPM
warns about unpackaged files, so newly added man pages can be
spotted)
support-files/mysql.spec.sh
1.95 05/10/27 14:51:29 lenz@stripped +25 -9
- adjusted file list: added man pages that are now part of the
official source distribution (taken from the documentation
server)
man/mysqlman.1
1.4 05/10/27 14:51:29 lenz@stripped +1 -1
- removed version number
man/Makefile.am
1.10 05/10/27 14:51:29 lenz@stripped +2 -24
- removed hard-coded list of man pages, the list is populated
during the configure stage. When building from BK, only one
placeholder file exists. For the release builds, this directory
is populated by the Bootstrap script, which takes man page files
from the documentation server.
configure.in
1.333 05/10/27 14:51:29 lenz@stripped +4 -0
- dynamically add man pages included in the man directory
(the BK tree only contains one dummy file, the directory is
populated by the Bootstrap script by copying current man pages
from the documentation server)
BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c
1.9 05/10/26 15:02:10 lenz@stripped +0 -0
Delete: man/replace.1.in
BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c
1.11 05/10/26 15:02:10 lenz@stripped +0 -0
Delete: man/perror.1.in
BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f
1.10 05/10/26 15:02:10 lenz@stripped +0 -0
Delete: man/mysqlshow.1.in
BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624
1.9 05/10/26 15:02:10 lenz@stripped +0 -0
Delete: man/mysql_zap.1.in
BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325
1.7 05/10/26 15:02:10 lenz@stripped +0 -0
Delete: man/mysql_fix_privilege_tables.1.in
BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5
1.13 05/10/26 15:02:09 lenz@stripped +0 -0
Delete: man/mysqldump.1.in
BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b
1.11 05/10/26 15:02:09 lenz@stripped +0 -0
Delete: man/mysqld_safe.1.in
BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6
1.9 05/10/26 15:02:08 lenz@stripped +0 -0
Delete: man/mysqld_multi.1.in
BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c
1.10 05/10/26 15:02:08 lenz@stripped +0 -0
Delete: man/mysqld.1.in
BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769
1.10 05/10/26 15:02:08 lenz@stripped +0 -0
Delete: man/mysqladmin.1.in
BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf
1.12 05/10/26 15:02:07 lenz@stripped +0 -0
Delete: man/mysqlaccess.1.in
BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a
1.13 05/10/26 15:02:07 lenz@stripped +0 -0
Delete: man/mysql.1.in
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19
1.9 05/10/26 15:02:07 lenz@stripped +0 -0
Delete: man/isamlog.1.in
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962
1.10 05/10/26 15:02:06 lenz@stripped +0 -0
Delete: man/isamchk.1.in
man/mysqlman.1
1.3 05/10/26 15:01:42 lenz@stripped +0 -0
Rename: man/mysqlman.1.in -> man/mysqlman.1
# 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: lenz
# Host: production.mysql.com
# Root: /data0/mysqldev/lenz/mysql-4.0
--- 1.332/configure.in 2005-09-08 12:57:32 +02:00
+++ 1.333/configure.in 2005-10-27 14:51:29 +02:00
@@ -2202,10 +2202,14 @@
if test "$with_man" = "yes"
then
man_dirs="man"
+ man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
+ man1_files=`echo $man1_files`
else
man_dirs=""
+ man1_files=""
fi
AC_SUBST(man_dirs)
+AC_SUBST(man1_files)
# Shall we build the bench code?
AC_ARG_WITH(bench,
--- 1.9/man/Makefile.am 2004-07-20 18:24:26 +02:00
+++ 1.10/man/Makefile.am 2005-10-27 14:51:29 +02:00
@@ -17,30 +17,8 @@
## Process this file with automake to create Makefile.in
-man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
-
-EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
- mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
- mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \
- mysqld_safe.1.in mysql_fix_privilege_tables.1.in
-
-CLEANFILES = $(man_MANS)
-
-SUFFIXES = .in
-
-.in:
- @RM@ -f $@ $@-t
- @SED@ \
- -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
- -e 's!@''sysconfdir''@!@sysconfdir@!' \
- -e 's!@''bindir''@!$(bindir)!g' \
- -e 's!@''libexecdir''@!$(libexecdir)!g' \
- -e 's!@''localstatedir''@!$(localstatedir)!g' \
- -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
- $< > $@-t
- @MV@ $@-t $@
+man1_MANS = @man1_files@
+EXTRA_DIST = $(man1_MANS)
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.94/support-files/mysql.spec.sh 2005-10-13 22:10:51 +02:00
+++ 1.95/support-files/mysql.spec.sh 2005-10-27 14:51:29 +02:00
@@ -440,41 +440,48 @@
%doc %attr(644, root, man) %{_mandir}/man1/isamchk.1*
%doc %attr(644, root, man) %{_mandir}/man1/isamlog.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
+%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}/man1/mysql_fix_privilege_tables.1*
%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*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
+%doc %attr(644, root, man) %{_mandir}/man1/pack_isam.1*
%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
%doc %attr(644, root, man) %{_mandir}/man1/replace.1*
+%doc %attr(644, root, man) %{_mandir}/man1/safe_mysqld.1*
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
%attr(755, root, root) %{_bindir}/isamchk
%attr(755, root, root) %{_bindir}/isamlog
-%attr(755, root, root) %{_bindir}/my_print_defaults
%attr(755, root, root) %{_bindir}/myisamchk
%attr(755, root, root) %{_bindir}/myisam_ftdump
%attr(755, root, root) %{_bindir}/myisamlog
%attr(755, root, root) %{_bindir}/myisampack
+%attr(755, root, root) %{_bindir}/my_print_defaults
+%attr(755, root, root) %{_bindir}/mysqlbug
%attr(755, root, root) %{_bindir}/mysql_convert_table_format
+%attr(755, root, root) %{_bindir}/mysqld_multi
+%attr(755, root, root) %{_bindir}/mysqld_safe
%attr(755, root, root) %{_bindir}/mysql_explain_log
%attr(755, root, root) %{_bindir}/mysql_fix_extensions
%attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables
+%attr(755, root, root) %{_bindir}/mysqlhotcopy
%attr(755, root, root) %{_bindir}/mysql_install_db
%attr(755, root, root) %{_bindir}/mysql_secure_installation
%attr(755, root, root) %{_bindir}/mysql_setpermission
-%attr(755, root, root) %{_bindir}/mysql_zap
-%attr(755, root, root) %{_bindir}/mysqlbug
-%attr(755, root, root) %{_bindir}/mysqld_multi
-%attr(755, root, root) %{_bindir}/mysqld_safe
-%attr(755, root, root) %{_bindir}/mysqlhotcopy
%attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/mysql_zap
%attr(755, root, root) %{_bindir}/pack_isam
%attr(755, root, root) %{_bindir}/perror
%attr(755, root, root) %{_bindir}/replace
-%attr(755, root, root) %{_bindir}/resolve_stack_dump
%attr(755, root, root) %{_bindir}/resolveip
+%attr(755, root, root) %{_bindir}/resolve_stack_dump
%attr(755, root, root) %{_bindir}/safe_mysqld
%attr(755, root, root) %{_sbindir}/mysqld
@@ -502,10 +509,14 @@
%attr(755, root, root) %{_bindir}/mysqlimport
%attr(755, root, root) %{_bindir}/mysqlshow
+%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlcheck.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqldump.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1*
%post shared
@@ -517,6 +528,7 @@
%files devel
%defattr(-, root, root, 0755)
%doc EXCEPTIONS-CLIENT
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
%attr(755, root, root) %{_bindir}/comp_err
%attr(755, root, root) %{_bindir}/mysql_config
%dir %attr(755, root, root) %{_includedir}/mysql
@@ -565,6 +577,10 @@
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
+* Thu Oct 27 2005 Lenz Grimmer <lenz@stripped>
+
+- added more man pages
+
* Thu Oct 13 2005 Lenz Grimmer <lenz@stripped>
- added a usermod call to assign a potential existing mysql user to the
--- 1.2/man/mysqlman.1.in 2005-03-17 18:40:36 +01:00
+++ 1.4/man/mysqlman.1 2005-10-27 14:51:29 +02:00
@@ -1,4 +1,4 @@
-.TH mysqlman 1 "20 July 2004" "MySQL @MYSQL_BASE_VERSION@" "MySQL database"
+.TH mysqlman 1 "20 July 2004" "MySQL" "MySQL database"
.SH NAME
mysqlman \- default man page for mysql
.SH "DESCRIPTION"
| Thread |
|---|
| • bk commit into 4.0 tree (lenz:1.2169) | lenz | 27 Oct |
