diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-03 13:27:12 +0200 |
commit | adc91387e3add6d9c850b7c2a44760deaceb3638 (patch) | |
tree | c772c6339d2f715a1a50766e30790307e0658f3e /man | |
parent | bc28b305e538774eae4152b300cd323e9a724393 (diff) | |
parent | 29c776cfd1e560846e394f39d79ae43ff7d70c61 (diff) | |
download | mariadb-git-adc91387e3add6d9c850b7c2a44760deaceb3638.tar.gz |
Merge 10.0 into 10.1
Diffstat (limited to 'man')
-rw-r--r-- | man/mysqladmin.1 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/man/mysqladmin.1 b/man/mysqladmin.1 index 14e34ed2f84..d974f569f1a 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, |