summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-12-14 11:34:30 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-12-14 11:34:30 +0200
commit866ccc8890a3932e260e43fa5fc7ab8170e6cc3d (patch)
tree33a95867072308d4973d3a812bcc088dcbf55a64 /client
parent159a6c2e608d04732cb678c7691345b9b1dc69b1 (diff)
parent1b5f0cbd465f92ffc278a924e765e41413d97420 (diff)
downloadmariadb-git-866ccc8890a3932e260e43fa5fc7ab8170e6cc3d.tar.gz
Merge bb-10.2-ext into 10.3
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 771fb947e73..c7ef8bfc47a 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}