diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqladmin.cc | 11 | ||||
| -rw-r--r-- | client/mysqldump.c | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index b95ad83f7e8..2e8b3cd588a 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -825,10 +825,17 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) } if (argv[1][0]) { + char *pw= argv[1]; +#ifdef __WIN__ + uint pw_len= strlen(pw); + if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'') + printf("Warning: single quotes were not trimmed from the password by" + " your command\nline client, as you might have expected.\n"); +#endif if (find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD) - make_scrambled_password_323(crypted_pw, argv[1]); + make_scrambled_password_323(crypted_pw, pw); else - make_scrambled_password(crypted_pw, argv[1]); + make_scrambled_password(crypted_pw, pw); } else crypted_pw[0]=0; /* No password */ diff --git a/client/mysqldump.c b/client/mysqldump.c index bb52a169b7d..489063ffc73 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1913,7 +1913,7 @@ static int init_dumping(char *database) MYSQL_ROW row; MYSQL_RES *dbinfo; - sprintf(qbuf,"SHOW CREATE DATABASE WITH IF NOT EXISTS %s", + sprintf(qbuf,"SHOW CREATE DATABASE IF NOT EXISTS %s", qdatabase); if (mysql_query_with_error_report(sock, &dbinfo, qbuf)) |