diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-13 23:14:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-14 08:40:01 +0200 |
| commit | ece9c54e1062ea70b8cf31d69c1ce4db9ba12f7d (patch) | |
| tree | 7f7fd7ea472ff807629fd5abe3a540072307fc49 /client | |
| parent | 58eb4e5db9e333768cc927d5d5a63d68fbd74548 (diff) | |
| parent | 7be5b6f0e6170461e7ccc6ec7947436af2e43e41 (diff) | |
| download | mariadb-git-ece9c54e1062ea70b8cf31d69c1ce4db9ba12f7d.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 4 |
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} |