Skip to content

Commit c5c5151

Browse files
iangilfillansvoj
authored andcommitted
MDEV-19847: Update mysqladmin man page
1 parent 223c550 commit c5c5151

File tree

1 file changed

+34
-2
lines changed

1 file changed

+34
-2
lines changed

man/mysqladmin.1

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'\" t
22
.\"
3-
.TH "\FBMYSQLADMIN\FR" "1" "28 December 2017" "MariaDB 10\&.4" "MariaDB Database System"
3+
.TH "\FBMYSQLADMIN\FR" "1" "27 June 2019" "MariaDB 10\&.4" "MariaDB Database System"
44
.\" -----------------------------------------------------------------
55
.\" * set default formatting
66
.\" -----------------------------------------------------------------
@@ -1367,6 +1367,22 @@ Verify server's "Common Name" in its cert against hostname used when connecting.
13671367
.sp -1
13681368
.IP \(bu 2.3
13691369
.\}
1370+
.\" mysqladmin: TLS Version option
1371+
.\" TLS Version option: mysqladmin
1372+
\fB\-\-tls\-version=\fR\fB\fIname\fR\fR,
1373+
.sp
1374+
Accepts a comma-separated list of TLS protocol versions\&. A TLS protocol version will only be enabled if it
1375+
is present in this list\&. All other TLS protocol versions will not be permitted\&.
1376+
.RE
1377+
.sp
1378+
.RS 4
1379+
.ie n \{\
1380+
\h'-04'\(bu\h'+03'\c
1381+
.\}
1382+
.el \{\
1383+
.sp -1
1384+
.IP \(bu 2.3
1385+
.\}
13701386
.\" mysqladmin: user option
13711387
.\" user option: mysqladmin
13721388
\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
14411457
\fIcount\fR
14421458
value is given, it indicates the number of times to retry\&. The default is one time\&.
14431459
.RE
1460+
.sp
1461+
.RS 4
1462+
.ie n \{\
1463+
\h'-04'\(bu\h'+03'\c
1464+
.\}
1465+
.el \{\
1466+
.sp -1
1467+
.IP \(bu 2.3
1468+
.\}
1469+
.\" mysqladmin: --wait-for-all-slaves option
1470+
.\" --wait-for-all-slaves option: mysqladmin
1471+
\fB\-\-wait\-for\-all\-slaves\fR
1472+
.sp
1473+
Wait for the last binlog event to be sent to all connected slaves before shutting down\&.
1474+
This option is off by default\&.
1475+
.RE
14441476
.PP
14451477
You can also set the following variables by using
14461478
\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
14771509
.SH "COPYRIGHT"
14781510
.br
14791511
.PP
1480-
Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 MariaDB Foundation
1512+
Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2019 MariaDB Foundation
14811513
.PP
14821514
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.
14831515
.PP

0 commit comments

Comments
 (0)