summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-12-13 23:14:15 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-12-14 08:40:01 +0200
commitece9c54e1062ea70b8cf31d69c1ce4db9ba12f7d (patch)
tree7f7fd7ea472ff807629fd5abe3a540072307fc49 /man
parent58eb4e5db9e333768cc927d5d5a63d68fbd74548 (diff)
parent7be5b6f0e6170461e7ccc6ec7947436af2e43e41 (diff)
downloadmariadb-git-ece9c54e1062ea70b8cf31d69c1ce4db9ba12f7d.tar.gz
Merge 10.1 into 10.2
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 876e224aa83..13b2a07cecb 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