summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-12-14 09:53:19 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-12-14 09:53:19 +0200
commit1b5f0cbd465f92ffc278a924e765e41413d97420 (patch)
tree0f386de98c507aca6127d3134ce58f428e63d283 /client
parent701e22d5cd6642e803cfca2443c522a2998e3047 (diff)
parent806380494353bb1389507def0256b3308e5cedbb (diff)
downloadmariadb-git-1b5f0cbd465f92ffc278a924e765e41413d97420.tar.gz
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'client')
-rw-r--r--client/mysql_upgrade.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 7ba15b772b5..14a47bce352 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -166,8 +166,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}