From 07e34cddb66da2e9e4ab5bdd8d52d1a72c2d2e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Tue, 28 Jan 2020 13:52:47 +0200 Subject: MDEV-14330: move tokudb manpages to right packages Move tokuftdump and tokuft_logprint man pages to storage/tokudb. The man pages are now part of tokudb-engine cmake component. This change is mostly for RPM & DEB based packaging generated through CMake & CPack. Debian upstream already handles this change via the custom scripts in debian/ --- man/CMakeLists.txt | 4 +- man/tokuft_logprint.1 | 16 ---- man/tokuftdump.1 | 237 -------------------------------------------------- 3 files changed, 2 insertions(+), 255 deletions(-) delete mode 100644 man/tokuft_logprint.1 delete mode 100644 man/tokuftdump.1 (limited to 'man') diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 0dd4004f22f..cc3f2701a77 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -23,10 +23,10 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 mariadb-service-convert.1 - mysqld_safe_helper.1 tokuftdump.1 wsrep_sst_common.1 + mysqld_safe_helper.1 wsrep_sst_common.1 wsrep_sst_mysqldump.1 wsrep_sst_rsync.1 wsrep_sst_xtrabackup-v2.1 wsrep_sst_xtrabackup.1 - galera_recovery.1 galera_new_cluster.1 tokuft_logprint.1 + galera_recovery.1 galera_new_cluster.1 mysql_ldb.1 wsrep_sst_mariabackup.1 mbstream.1 mariabackup.1 wsrep_sst_rsync_wan.1) diff --git a/man/tokuft_logprint.1 b/man/tokuft_logprint.1 deleted file mode 100644 index d6f69e0aeeb..00000000000 --- a/man/tokuft_logprint.1 +++ /dev/null @@ -1,16 +0,0 @@ -'\" t -.\" -.TH "\FBTOKUFT_LOGPRINT\FR" "1" "29 March 2019" "MariaDB 10\&.2" "MariaDB Database System" -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH NAME -tokuft_logprint \- Dump the log from stdin to stdout -.SH DESCRIPTION -Use: Dump the log from stdin to stdout\. Use \fBtokuft_logprint \-\-help\fR for details on usage\. -.PP -For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/man/tokuftdump.1 b/man/tokuftdump.1 deleted file mode 100644 index 79129a1a2e1..00000000000 --- a/man/tokuftdump.1 +++ /dev/null @@ -1,237 +0,0 @@ -'\" t -.\" -.TH "\FBTOKUFTDUMP\FR" "1" "3 April 2017" "MariaDB 10\&.2" "MariaDB Database System" -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.\" tokuftdump -.\" upgrading MySQL -.SH "NAME" -tokuftdump \- look into the fractal tree file -.SH "SYNOPSIS" -.HP \w'\fBtokuftdump\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u -\fBtokuftdump [\fR\fB\fIoptions\fR\fR\fB]\fR -.SH "DESCRIPTION" -.PP -\fBtokuftdump\fR -Investigates and diagnoses the fractal tree\&. -.PP -\fBtokuftdump\fR -supports the following options for processing option files\&. -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: interactive option -.\" interactive option: tokuftdump -\fB\-\-interactive\fR -.sp -Interactive\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: support option -.\" support option: tokuftdump -\fB\-\-support \fI/path/to/fractal-tree/file\fR -.sp -An interactive way to see what messages and/or switch between FTs\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: json option -.\" json option: tokuftdump -\fB\-\-json \fI/path/to/fractal-tree/file [output_json_file]\fR -.sp -If the output json file is left empty, FT\&.json will be created automatically\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: nodata option -.\" nodata option: tokuftdump -\fB\-\-nodata\fR -.sp -Nodata\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: dumpdata option -.\" dumpdata option: tokuftdump -\fB\-\-dumpdata = \fR\fB\fI0|1\fR\fR -.sp -Dumpdata\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: header option -.\" header option: tokuftdump -\fB\-\-header\fR -.sp -Header\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: rootnode option -.\" rootnode option: tokuftdump -\fB\-\-rootnode\fR -.sp -Rootnode\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: node option -.\" node option: tokuftdump -\fB\-\-node \fIN\fR -.sp -Node\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: fragmentation option -.\" fragmentation option: tokuftdump -\fB\-\-fragmentation\fR -.sp -Fragmentation\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: garbage option -.\" garbage option: tokuftdump -\fB\-\-garbage\fR -.sp -Garbage\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: tsv option -.\" tsv option: tokuftdump -\fB\-\-tsv\fR -.sp -TSV\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: translation-table option -.\" translation-table option: tokuftdump -\fB\-\-translation\-table\fR -.sp -Translation table\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -.\" tokuftdump: summary option -.\" summary option: tokuftdump -\fB\-\-summary\fR -.sp -Provide summary info\&. -.RE -.SH "COPYRIGHT" -.br -.PP -Copyright 2016 MariaDB Foundation -.PP -This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. -.PP -This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -.PP -You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/. -.sp -.SH "SEE ALSO" -For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ -.SH AUTHOR -MariaDB Foundation (http://www.mariadb.org/). -- cgit v1.2.1 From 5271d43648957141b55159958b66fd635d80ac85 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 28 Jan 2020 18:03:13 +0200 Subject: MDEV-14330 Move mysqltest.1 man page to appropriate test package from server package Original patch from Daniel Black , backported to 10.1. --- man/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'man') diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 6580820a835..3ea3bfd57eb 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -21,7 +21,7 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 - mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 + perror.1 replace.1 resolve_stack_dump.1 resolveip.1 mysqlbug.1 mariadb-service-convert.1 mysqld_safe_helper.1 tokuftdump.1 wsrep_sst_common.1 wsrep_sst_mysqldump.1 wsrep_sst_rsync.1 @@ -36,7 +36,8 @@ SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1 mysql_plugin.1 mysql_embedded.1) SET(MAN1_DEVEL mysql_config.1) SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 - mysqltest_embedded.1 mysql_client_test_embedded.1 my_safe_process.1) + mysqltest.1 mysqltest_embedded.1 mysql_client_test_embedded.1 + my_safe_process.1) INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) -- cgit v1.2.1 From c8bd8d5c64a2bbe603f28cfe10774556da5312a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 31 Jan 2020 13:16:11 +0200 Subject: MDEV-14330: After-merge fix The merge commit 5ff66fb0b97fa3f8ecc453c48bac48ceae76bdea accidentally omitted part of commit 07e34cddb66da2e9e4ab5bdd8d52d1a72c2d2e8e. --- man/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'man') diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index cdce3c9b983..f36da7c8915 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -23,9 +23,9 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 mariadb-service-convert.1 - mysqld_safe_helper.1 tokuftdump.1 wsrep_sst_common.1 + mysqld_safe_helper.1 wsrep_sst_common.1 wsrep_sst_mysqldump.1 wsrep_sst_rsync.1 - galera_recovery.1 galera_new_cluster.1 tokuft_logprint.1 + galera_recovery.1 galera_new_cluster.1 mysql_ldb.1 wsrep_sst_mariabackup.1 mbstream.1 mariabackup.1 wsrep_sst_rsync_wan.1) -- cgit v1.2.1