diff options
| author | unknown <kostja@oak.local> | 2003-07-08 12:03:46 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-07-08 12:03:46 +0400 |
| commit | db3e9344d6ccfd5b39d8fa2499e5dcb2ed90f808 (patch) | |
| tree | 4923c7c60652ab9943391b151c20cc57093f3ead /client | |
| parent | 8d128eed802e47fbce895a1f7d46caf56ac4a50e (diff) | |
| parent | 78c3d9684ce2e83efc00878c3e901487bd5267bf (diff) | |
| download | mariadb-git-db3e9344d6ccfd5b39d8fa2499e5dcb2ed90f808.tar.gz | |
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
into oak.local:/home/kostja/mysql/mysql-4.1
scripts/mysql_create_system_tables.sh:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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); |