diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 11:45:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 11:45:05 +0300 |
| commit | 15fa70b8408a2146b300a4e1b19819addafa5929 (patch) | |
| tree | 228e88d1e8e3b3d46f5a54ab6e1bdcdd4478b82e /client | |
| parent | 19d4e023c681ecb26acf06318e69ecae6c4ec9be (diff) | |
| parent | 6bc4444d7ca81786de98f27669891692c2d2e21c (diff) | |
| download | mariadb-git-15fa70b8408a2146b300a4e1b19819addafa5929.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 68785ccff8e..26fa275dacd 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -153,7 +153,7 @@ static struct my_option my_long_options[]= &opt_systables_only, &opt_systables_only, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, #define USER_OPT (array_elements(my_long_options) - 6) - {"user", 'u', "User for login if not current user.", &opt_user, + {"user", 'u', "User for login.", &opt_user, &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"verbose", 'v', "Display more output about the process; Using it twice will print connection argument; Using it 3 times will print out all CHECK, RENAME and ALTER TABLE during the check phase.", &opt_not_used, &opt_not_used, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, |