summaryrefslogtreecommitdiff
path: root/client/mysql_upgrade.c
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 /client/mysql_upgrade.c
parentde76cbdcb0728b80c0f7b453b24b0b81f653e450 (diff)
parent622466644dda1e3c72f5fe276e3a8127b20c1182 (diff)
downloadmariadb-git-ce07d09fd3eb1abbfe3c2ff75a78ef4eacf34bd7.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'client/mysql_upgrade.c')
-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 c10dc20e7d7..cbdd398c1e1 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}