summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-12-12 19:28:26 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-12-12 19:28:26 +0200
commitce07d09fd3eb1abbfe3c2ff75a78ef4eacf34bd7 (patch)
tree006fe23182bd63ca669c55ef7f52b6374e7c0df2 /man
parentde76cbdcb0728b80c0f7b453b24b0b81f653e450 (diff)
parent622466644dda1e3c72f5fe276e3a8127b20c1182 (diff)
downloadmariadb-git-ce07d09fd3eb1abbfe3c2ff75a78ef4eacf34bd7.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'man')
-rw-r--r--man/mysql_upgrade.13
1 files changed, 1 insertions, 2 deletions
diff --git a/man/mysql_upgrade.1 b/man/mysql_upgrade.1
index 48ea44a5ac9..f04fa122383 100644
--- a/man/mysql_upgrade.1
+++ b/man/mysql_upgrade.1
@@ -691,8 +691,7 @@ it was built/distributed. Defaults to on; use \fB\-\-skip\-version\-check\fR to
.sp
Cause binary logging to be enabled while
\fBmysql_upgrade\fR
-runs\&. This is the default behavior; to disable binary logging during the upgrade, use the inverse of this option (that is, start the program with
-\fB\-\-skip\-write\-binlog\fR)\&.
+runs\&.
.RE
.SH "COPYRIGHT"
.br