Commit 421eeb18 authored by Sergei Golubchik's avatar Sergei Golubchik

Revert "MDEV-19949 mariabackup option of '--password' or '-p' without...

Revert "MDEV-19949 mariabackup option of '--password' or '-p' without specifying password in commandline"

This reverts commit 91fb8b7f.

Incompatible change, see tests in the next commit
parent 33e4fbf0
...@@ -370,7 +370,6 @@ my_bool opt_no_backup_locks = FALSE; ...@@ -370,7 +370,6 @@ my_bool opt_no_backup_locks = FALSE;
my_bool opt_decompress = FALSE; my_bool opt_decompress = FALSE;
my_bool opt_remove_original; my_bool opt_remove_original;
my_bool opt_log_innodb_page_corruption; my_bool opt_log_innodb_page_corruption;
my_bool tty_password= FALSE;
my_bool opt_lock_ddl_per_table = FALSE; my_bool opt_lock_ddl_per_table = FALSE;
static my_bool opt_check_privileges; static my_bool opt_check_privileges;
...@@ -1368,7 +1367,7 @@ struct my_option xb_client_options[]= { ...@@ -1368,7 +1367,7 @@ struct my_option xb_client_options[]= {
"This option specifies the password to use " "This option specifies the password to use "
"when connecting to the database. It accepts a string argument. " "when connecting to the database. It accepts a string argument. "
"See mysql --help for details.", "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, {"protocol", OPT_PROTOCOL,
"The protocol to use for connection (tcp, socket, pipe, memory).", 0, 0, "The protocol to use for connection (tcp, socket, pipe, memory).", 0, 0,
...@@ -2044,7 +2043,6 @@ xb_get_one_option(const struct my_option *opt, ...@@ -2044,7 +2043,6 @@ xb_get_one_option(const struct my_option *opt,
break; break;
case 'p': case 'p':
opt_password = argument; opt_password = argument;
tty_password = argument == NULL;
break; break;
case OPT_PROTOCOL: case OPT_PROTOCOL:
if (argument) if (argument)
...@@ -6751,8 +6749,6 @@ void handle_options(int argc, char **argv, char ***argv_server, ...@@ -6751,8 +6749,6 @@ void handle_options(int argc, char **argv, char ***argv_server,
if (*start) if (*start)
start[1]= 0; start[1]= 0;
} }
else if (tty_password)
opt_password= my_get_tty_password(NullS);
/* 4) Process --mysqld-args options, ignore unknown options */ /* 4) Process --mysqld-args options, ignore unknown options */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment