Merge branch '10.5' into 10.6

This commit is contained in:
Yuchen Pei 2024-07-16 15:54:22 +08:00
commit f071b7620b
No known key found for this signature in database
GPG key ID: 3DD1B35105743563
62 changed files with 3237 additions and 1217 deletions

View file

@ -573,6 +573,22 @@ privilege\&.
.sp -1
.IP \(bu 2.3
.\}
.\" mysqlbinlog: flashback option
.\" flashback option: mysqlbinlog
\fB\-\-flashback\fR,
\fB\-B\fR
.sp
Support flashback mode\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
.\" mysqlbinlog: force-if-open option
.\" force-if-open option: mysqlbinlog
\fB\-\-force\-if\-open\fR

View file

@ -894,22 +894,6 @@ instead\&.
.sp -1
.IP \(bu 2.3
.\}
.\" mysqldump: flashback option
.\" flashback option: mysqldump
\fB\-\-flashback\fR,
\fB\-B\fR
.sp
Support flashback mode\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
.\" mysqldump: flush-logs option
.\" flush-logs option: mysqldump
\fB\-\-flush\-logs\fR,