database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Various command-line utilities, including mysqlbinlog and mysqldump, don't

Browse Source 
handle the --skip-password option correctly. (Bug #28479)
This commit is contained in:
Jim Winstead
2009-05-07 10:51:55 -07:00
parent 5b66e5fe4b
commit 6280e26c48
9 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql_upgrade.c
View File

@ -231,6 +231,8 @@ get_one_option(int optid, const struct my_option *opt,
break; break;
case 'p': case 'p':
if (argument == disabled_my_option)
argument= (char*) ""; // Don't require password
tty_password= 1; tty_password= 1;
add_option= FALSE; add_option= FALSE;
if (argument) if (argument)

2
client/mysqladmin.cc
View File

@ -232,6 +232,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
opt_count_iterations= 1; opt_count_iterations= 1;
break; break;
case 'p': case 'p':
if (argument == disabled_my_option)
argument= (char*) ""; // Don't require password
if (argument) if (argument)
{ {
char *start=argument; char *start=argument;

2
client/mysqlbinlog.cc
View File

@ -1226,6 +1226,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
one_database = 1; one_database = 1;
break; break;
case 'p': case 'p':
if (argument == disabled_my_option)
argument= (char*) ""; // Don't require password
if (argument) if (argument)
{ {
my_free(pass,MYF(MY_ALLOW_ZERO_PTR)); my_free(pass,MYF(MY_ALLOW_ZERO_PTR));

2
client/mysqlcheck.c
View File

@ -286,6 +286,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
what_to_do= DO_UPGRADE; what_to_do= DO_UPGRADE;
break; break;
case 'p': case 'p':
if (argument == disabled_my_option)
argument= (char*) ""; // Don't require password
if (argument) if (argument)
{ {
char *start = argument; char *start = argument;

2
client/mysqldump.c
View File

@ -702,6 +702,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
break; break;
#endif #endif
case 'p': case 'p':
if (argument == disabled_my_option)
argument= (char*) ""; // Don't require password
if (argument) if (argument)
{ {
char *start=argument; char *start=argument;

2
client/mysqlimport.c
View File

@ -221,6 +221,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
break; break;
#endif #endif
case 'p': case 'p':
if (argument == disabled_my_option)
argument= (char*) ""; // Don't require password
if (argument) if (argument)
{ {
char *start=argument; char *start=argument;

2
client/mysqlshow.c
View File

@ -281,6 +281,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
opt_verbose++; opt_verbose++;
break; break;
case 'p': case 'p':
if (argument == disabled_my_option)
argument= (char*) ""; // Don't require password
if (argument) if (argument)
{ {
char *start=argument; char *start=argument;

2
client/mysqlslap.c
View File

@ -712,6 +712,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
verbose++; verbose++;
break; break;
case 'p': case 'p':
if (argument == disabled_my_option)
argument= (char*) ""; // Don't require password
if (argument) if (argument)
{ {
char *start= argument; char *start= argument;

2
client/mysqltest.cc
View File

@ -5803,6 +5803,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
break; break;
} }
case 'p': case 'p':
if (argument == disabled_my_option)
argument= (char*) ""; // Don't require password
if (argument) if (argument)
{ {
my_free(opt_pass, MYF(MY_ALLOW_ZERO_PTR)); my_free(opt_pass, MYF(MY_ALLOW_ZERO_PTR));