diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2023-01-10 11:56:44 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2023-01-11 17:57:23 +0100 |
| commit | 43dc3782348b7558cf2cec1eba809f77ed664d08 (patch) | |
| tree | cb0881aedf51bc340ce540ae94e2682439b71edc | |
| parent | b4f70fc177a7497fbfc62136fb66250adc60968f (diff) | |
| download | mariadb-git-bb-10.11-wlad-MDEV-26714.tar.gz | |
MDEV-26714 - fix mariadb-upgradebb-10.11-wlad-MDEV-26714
mariadb-upgrade needs to accept credential-manager parameter.
At the moment, it would have no effect - all the credential manager logic
is encapsulated inside cli_connect, and mariadb-upgrade does not
connect to the server itself (instead invoking the cli)
| -rw-r--r-- | client/mysql_upgrade.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index ba42549ecfc..9648c5de33d 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -77,6 +77,8 @@ static my_bool opt_write_binlog; #define OPT_SILENT OPT_MAX_CLIENT_OPTION +#include "credmgr-var.h" + static struct my_option my_long_options[]= { {"help", '?', "Display this help message and exit.", 0, 0, 0, GET_NO_ARG, @@ -169,6 +171,7 @@ static struct my_option my_long_options[]= "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}, +#include "credmgr-opt.h" {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} }; |