summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Gilfillan <github@greenman.co.za>2017-11-20 11:00:44 +0200
committerSergey Vojtovich <svoj@mariadb.org>2017-11-22 22:30:32 +0800
commit622466644dda1e3c72f5fe276e3a8127b20c1182 (patch)
tree74905aaee820bf2c4de014ae86c7cdac5c8f4040
parentd8ccc61f76d56b761e52564701814739abc190d1 (diff)
downloadmariadb-git-622466644dda1e3c72f5fe276e3a8127b20c1182.tar.gz
mysql_uprade --help and man page fixes
-rw-r--r--client/mysql_upgrade.c4
-rw-r--r--man/mysql_upgrade.13
2 files changed, 3 insertions, 4 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index e131aabd8b6..cecf212ad92 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -164,8 +164,8 @@ static struct my_option my_long_options[]=
"server with which it was built/distributed.",
&opt_version_check, &opt_version_check, 0,
GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
- {"write-binlog", OPT_WRITE_BINLOG, "All commands including those, "
- "issued by mysqlcheck, are written to the binary log.",
+ {"write-binlog", OPT_WRITE_BINLOG, "All commands including those "
+ "issued by mysqlcheck are written to the binary log.",
&opt_write_binlog, &opt_write_binlog, 0, GET_BOOL, NO_ARG,
0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
diff --git a/man/mysql_upgrade.1 b/man/mysql_upgrade.1
index 3948a670436..200037de41a 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