From 43dc3782348b7558cf2cec1eba809f77ed664d08 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 10 Jan 2023 11:56:44 +0100 Subject: MDEV-26714 - fix mariadb-upgrade 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) --- client/mysql_upgrade.c | 3 +++ 1 file changed, 3 insertions(+) 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} }; -- cgit v1.2.1