diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 14:25:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-13 14:25:06 +0300 |
| commit | b30a013142179a4bf72ce1779bea84596ba28685 (patch) | |
| tree | c4509170481b121bfdd7559fc15df42be76af146 /client/mysql_upgrade.c | |
| parent | 0186b0a07760b734af61a9e45ebdb5a077d1872d (diff) | |
| parent | 38f6c47f8a0a9bc313e4875c4676985249771c76 (diff) | |
| download | mariadb-git-b30a013142179a4bf72ce1779bea84596ba28685.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'client/mysql_upgrade.c')
| -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 9c68aad2746..a6af46e6d7b 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -148,7 +148,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}, |