From 33c1f20d8e549c4c48fda4c8bb95e024d96f7629 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 28 Feb 2017 20:21:19 +1100 Subject: MDEV-11610: Add --local to mysqladmin --- man/mysqladmin.1 | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'man') diff --git a/man/mysqladmin.1 b/man/mysqladmin.1 index e2b1753ff9f..65f348cab0c 100644 --- a/man/mysqladmin.1 +++ b/man/mysqladmin.1 @@ -816,6 +816,18 @@ Connect to the MariaDB server on the given host\&. .sp -1 .IP \(bu 2.3 .\} +.\" mysqladmin: local option +.\" local option: mysqladmin +\fB\-\-local\fR, +\fB\-l\fR +.sp +Suppress the SQL command(s) from being written to the binary log by enabled sql_log_bin=0 for the session\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} .\" mysqladmin: no-beep option .\" no-beep option: mysqladmin \fB\-\-no\-beep\fR, -- cgit v1.2.1 From bb4ef470c24cdbcedba3dd3dcda3b3d88b6fb491 Mon Sep 17 00:00:00 2001 From: iangilfillan Date: Wed, 8 Mar 2017 17:35:55 +0200 Subject: Minor wording fix in mysqladmin man page --- man/mysqladmin.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') diff --git a/man/mysqladmin.1 b/man/mysqladmin.1 index d974f569f1a..d1fdfd9d5aa 100644 --- a/man/mysqladmin.1 +++ b/man/mysqladmin.1 @@ -821,7 +821,7 @@ Connect to the MariaDB server on the given host\&. \fB\-\-local\fR, \fB\-l\fR .sp -Suppress the SQL command(s) from being written to the binary log by enabled sql_log_bin=0 for the session\&. +Suppress the SQL command(s) from being written to the binary log by enabling sql_log_bin=0 for the session\&. .RE .sp .RS 4 -- cgit v1.2.1 From 18de8296182f42cdf663573949a82950b72af8fc Mon Sep 17 00:00:00 2001 From: iangilfillan Date: Thu, 9 Mar 2017 13:18:40 +0200 Subject: MDEV-11964 Add missing stub manpages --- man/mariadb-service-convert.1 | 20 ++++ man/mysqld_safe_helper.1 | 16 +++ man/tokuftdump.1 | 237 ++++++++++++++++++++++++++++++++++++++++++ man/wsrep_sst_common.1 | 16 +++ man/wsrep_sst_mysqldump.1 | 16 +++ man/wsrep_sst_rsync.1 | 16 +++ man/wsrep_sst_xtrabackup-v2.1 | 16 +++ man/wsrep_sst_xtrabackup.1 | 16 +++ 8 files changed, 353 insertions(+) create mode 100644 man/mariadb-service-convert.1 create mode 100644 man/mysqld_safe_helper.1 create mode 100644 man/tokuftdump.1 create mode 100644 man/wsrep_sst_common.1 create mode 100644 man/wsrep_sst_mysqldump.1 create mode 100644 man/wsrep_sst_rsync.1 create mode 100644 man/wsrep_sst_xtrabackup-v2.1 create mode 100644 man/wsrep_sst_xtrabackup.1 (limited to 'man') diff --git a/man/mariadb-service-convert.1 b/man/mariadb-service-convert.1 new file mode 100644 index 00000000000..6301087208b --- /dev/null +++ b/man/mariadb-service-convert.1 @@ -0,0 +1,20 @@ +'\" t +.\" +.TH "\FBMARIADB-SERVICE-CONVERT\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +mariadb-service-convert \- generate a mariadb.service file based on the current mysql/mariadb settings +.SH DESCRIPTION +Use: Generate a mariadb.service file based on the current mysql/mariadb settings\. +This is to assist distro maintainers in migrating to systemd service definations from +a user mysqld_safe settings in the my.cnf files\. +.PP +Redirect output to user directory like /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/man/mysqld_safe_helper.1 b/man/mysqld_safe_helper.1 new file mode 100644 index 00000000000..63770a49d28 --- /dev/null +++ b/man/mysqld_safe_helper.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBMYSQLD_SAFE_HELPER\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +mysqld_safe_helper \- helper script +.SH DESCRIPTION +Use: Helper script\. +.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 new file mode 100644 index 00000000000..d0a11a840a5 --- /dev/null +++ b/man/tokuftdump.1 @@ -0,0 +1,237 @@ +'\" t +.\" +.TH "\FBTOKUFTDUMP\FR" "1" "9 March 2017" "MariaDB 10\&.1" "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-1301 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/). diff --git a/man/wsrep_sst_common.1 b/man/wsrep_sst_common.1 new file mode 100644 index 00000000000..05242e66c00 --- /dev/null +++ b/man/wsrep_sst_common.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBWSREP_SST_COMMON\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +wsrep_sst_common \- common command line parser to be sourced by other SST scripts +.SH DESCRIPTION +Use: Common command line parser to be sourced by other SST scripts\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/man/wsrep_sst_mysqldump.1 b/man/wsrep_sst_mysqldump.1 new file mode 100644 index 00000000000..17ad5b2cdf1 --- /dev/null +++ b/man/wsrep_sst_mysqldump.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBWSREP_SST_MYSQLDUMP\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +wsrep_sst_mysqldump \- mysqldump\-based state snapshot transfer +.SH DESCRIPTION +Use: mysqldump-based state snapshot transfer\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/man/wsrep_sst_rsync.1 b/man/wsrep_sst_rsync.1 new file mode 100644 index 00000000000..95a80b20821 --- /dev/null +++ b/man/wsrep_sst_rsync.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBWSREP_SST_RSYNC\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +wsrep_sst_mysqldump \- rsync-based state snapshot transfer +.SH DESCRIPTION +Use: rsync-based state snapshot transfer\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/man/wsrep_sst_xtrabackup-v2.1 b/man/wsrep_sst_xtrabackup-v2.1 new file mode 100644 index 00000000000..d61ce803b93 --- /dev/null +++ b/man/wsrep_sst_xtrabackup-v2.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBWSREP_SST_XTRABACKUP-V2\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +wsrep_sst_xtrabackup-v2 \- xtrabackup\-based state snapshot transfer +.SH DESCRIPTION +Use: xtrabackup-based state snapshot transfer\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/man/wsrep_sst_xtrabackup.1 b/man/wsrep_sst_xtrabackup.1 new file mode 100644 index 00000000000..9644a29c4ca --- /dev/null +++ b/man/wsrep_sst_xtrabackup.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBWSREP_SST_XTRABACKUP\FR" "1" "24 January 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +wsrep_sst_xtrabackup \- xtrabackup\-based state snapshot transfer +.SH DESCRIPTION +Use: xtrabackup-based state snapshot transfer\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ -- cgit v1.2.1 From c333cae652491998c34526ab0b5bfc3ecb2fe474 Mon Sep 17 00:00:00 2001 From: =Ian Gilfillan Date: Thu, 16 Mar 2017 13:35:36 +0200 Subject: MDEV-11964 Add more stub missing man pages --- man/CMakeLists.txt | 6 +++++- man/galera_new_cluster.1 | 16 ++++++++++++++++ man/galera_recovery.1 | 16 ++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 man/galera_new_cluster.1 create mode 100644 man/galera_recovery.1 (limited to 'man') diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index c4383b31a17..cd32f25e4f0 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -22,7 +22,11 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.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 - resolveip.1 mysqlbug.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 + wsrep_sst_xtrabackup-v2.1 wsrep_sst_xtrabackup.1 + galera_recovery.1 galera_new_cluster.1) SET(MAN8_SERVER mysqld.8) SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 diff --git a/man/galera_new_cluster.1 b/man/galera_new_cluster.1 new file mode 100644 index 00000000000..c351a5e0c5f --- /dev/null +++ b/man/galera_new_cluster.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBGALERA_NEW_CLUSTER\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +galera_new_cluster \- starting a new Galera cluster +.SH DESCRIPTION +Use: Starting a new Galera Cluster\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ diff --git a/man/galera_recovery.1 b/man/galera_recovery.1 new file mode 100644 index 00000000000..12cb450da46 --- /dev/null +++ b/man/galera_recovery.1 @@ -0,0 +1,16 @@ +'\" t +.\" +.TH "\FBGALERA_RECOVERY\FR" "1" "26 January 2017" "MariaDB 10\&.1" "MariaDB Database System" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH NAME +galera_recovery \- recover from non\-graceful shutdown +.SH DESCRIPTION +Use: Recover from non\-graceful shutdown\. +.PP +For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/ -- cgit v1.2.1