summaryrefslogtreecommitdiff
path: root/man/mysqlbinlog.1
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-05-18 11:13:45 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-05-18 11:13:45 +0300
commitf09d33f521b50bb8a0a27764c9732f0dda2aeefb (patch)
tree83cf75188514799b5d42243e136b55dea97a4aaf /man/mysqlbinlog.1
parent34340fb501f97d7289c165dd6599a3942087bc41 (diff)
parent7b51d11cca8898f319ddde5d7048cb81b43fef06 (diff)
downloadmariadb-git-f09d33f521b50bb8a0a27764c9732f0dda2aeefb.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'man/mysqlbinlog.1')
-rw-r--r--man/mysqlbinlog.118
1 files changed, 1 insertions, 17 deletions
diff --git a/man/mysqlbinlog.1 b/man/mysqlbinlog.1
index 3d12a8fa083..633300bb7c5 100644
--- a/man/mysqlbinlog.1
+++ b/man/mysqlbinlog.1
@@ -141,7 +141,7 @@ Display a help message and exit\&.
.\}
.\" mysqlbinlog: base64-output option
.\" base64-output option: mysqlbinlog
-\fB\-\-base64\-output[=\fR\fB\fIvalue\fR\fR\fB]\fR
+\fB\-\-base64\-output=\fR\fB\fIvalue\fR\fR\fB\fR
.sp
This option determines when events should be displayed encoded as base\-64 strings using
BINLOG
@@ -192,22 +192,6 @@ to re\-execute binary log file contents\&. The other option values are intended
.sp -1
.IP \(bu 2.3
.\}
-ALWAYS
-displays
-BINLOG
-statements whenever possible\&. This is the implied value if the option is given as
-\fB\-\-base64\-output\fR
-without a value\&. Both ALWAYS and not giving a value are deprecated.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
NEVER
causes
BINLOG