diff options
author | Ian Gilfillan <github@greenman.co.za> | 2019-06-27 14:35:34 +0200 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-07-01 12:09:40 +0400 |
commit | c5c515130cac1ae05b21a7836da91a4a1ffc677a (patch) | |
tree | 14897891f226ef7bde9af7b5d231972443fb26f9 /man | |
parent | 223c550d92330881619c89ffd00c315dbca0a480 (diff) | |
download | mariadb-git-c5c515130cac1ae05b21a7836da91a4a1ffc677a.tar.gz |
MDEV-19847: Update mysqladmin man page
Diffstat (limited to 'man')
-rw-r--r-- | man/mysqladmin.1 | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/man/mysqladmin.1 b/man/mysqladmin.1 index b6d71a2b58c..9fc0ee974dd 100644 --- a/man/mysqladmin.1 +++ b/man/mysqladmin.1 @@ -1,6 +1,6 @@ '\" t .\" -.TH "\FBMYSQLADMIN\FR" "1" "28 December 2017" "MariaDB 10\&.4" "MariaDB Database System" +.TH "\FBMYSQLADMIN\FR" "1" "27 June 2019" "MariaDB 10\&.4" "MariaDB Database System" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -1367,6 +1367,22 @@ Verify server's "Common Name" in its cert against hostname used when connecting. .sp -1 .IP \(bu 2.3 .\} +.\" mysqladmin: TLS Version option +.\" TLS Version option: mysqladmin +\fB\-\-tls\-version=\fR\fB\fIname\fR\fR, +.sp +Accepts a comma-separated list of TLS protocol versions\&. A TLS protocol version will only be enabled if it +is present in this list\&. All other TLS protocol versions will not be permitted\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} .\" mysqladmin: user option .\" user option: mysqladmin \fB\-\-user=\fR\fB\fIuser_name\fR\fR, @@ -1441,6 +1457,22 @@ If the connection cannot be established, wait and retry instead of aborting\&. I \fIcount\fR value is given, it indicates the number of times to retry\&. The default is one time\&. .RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +.\" mysqladmin: --wait-for-all-slaves option +.\" --wait-for-all-slaves option: mysqladmin +\fB\-\-wait\-for\-all\-slaves\fR +.sp +Wait for the last binlog event to be sent to all connected slaves before shutting down\&. +This option is off by default\&. +.RE .PP You can also set the following variables by using \fB\-\-\fR\fB\fIvar_name\fR\fR\fB=\fR\fB\fIvalue\fR\fR @@ -1477,7 +1509,7 @@ The maximum number of seconds to wait for server shutdown\&. The default value i .SH "COPYRIGHT" .br .PP -Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 MariaDB Foundation +Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2019 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 |