Skip to content

Commit

Permalink
Revert "MDEV-19949 mariabackup option of '--password' or '-p' without…
Browse files Browse the repository at this point in the history
… specifying password in commandline"

This reverts commit 91fb8b7.

Incompatible change, see tests in the next commit
  • Loading branch information
vuvova committed May 7, 2024
1 parent 33e4fbf commit 421eeb1
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions extra/mariabackup/xtrabackup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@ my_bool opt_no_backup_locks = FALSE;
my_bool opt_decompress = FALSE;
my_bool opt_remove_original;
my_bool opt_log_innodb_page_corruption;
my_bool tty_password= FALSE;

my_bool opt_lock_ddl_per_table = FALSE;
static my_bool opt_check_privileges;
Expand Down Expand Up @@ -1368,7 +1367,7 @@ struct my_option xb_client_options[]= {
"This option specifies the password to use "
"when connecting to the database. It accepts a string argument. "
"See mysql --help for details.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

{"protocol", OPT_PROTOCOL,
"The protocol to use for connection (tcp, socket, pipe, memory).", 0, 0,
Expand Down Expand Up @@ -2044,7 +2043,6 @@ xb_get_one_option(const struct my_option *opt,
break;
case 'p':
opt_password = argument;
tty_password = argument == NULL;
break;
case OPT_PROTOCOL:
if (argument)
Expand Down Expand Up @@ -6751,8 +6749,6 @@ void handle_options(int argc, char **argv, char ***argv_server,
if (*start)
start[1]= 0;
}
else if (tty_password)
opt_password= my_get_tty_password(NullS);

/* 4) Process --mysqld-args options, ignore unknown options */

Expand Down

0 comments on commit 421eeb1

Please sign in to comment.