diff options
| author | kostja@oak.local <> | 2003-09-03 14:12:10 +0400 |
|---|---|---|
| committer | kostja@oak.local <> | 2003-09-03 14:12:10 +0400 |
| commit | 36dd82c1d5b8426f74b698182f9fac05e65682ac (patch) | |
| tree | 4aa3e74d29fde5abc55c20c2c14e6c286e467c6e /client | |
| parent | f655ba9866e62296e773b1717c51301d528404fe (diff) | |
| parent | 765053c83894458a15a82cce5e9b549c210db42c (diff) | |
| download | mariadb-git-36dd82c1d5b8426f74b698182f9fac05e65682ac.tar.gz | |
merge commit, hope that none of bar and dlenev changes were
lost.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqladmin.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 018bcbc1963..f263d321a7b 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -769,9 +769,12 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) return 1; } if (argv[1][0]) - make_scrambled_password(crypted_pw,argv[1], - (find_type(argv[0], &command_typelib, 2) == - ADMIN_OLD_PASSWORD), &rand_st); + { + if (find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD) + make_scrambled_password_323(crypted_pw, argv[1]); + else + make_scrambled_password(crypted_pw, argv[1]); + } else crypted_pw[0]=0; /* No password */ sprintf(buff,"set password='%s',sql_log_off=0",crypted_pw); |