diff options
| author | unknown <peter@mysql.com> | 2002-10-20 00:09:11 +0400 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-10-20 00:09:11 +0400 |
| commit | a456cfa1353e02978ff1d32c77afb9900c763890 (patch) | |
| tree | bb2d1c9d6e87f090c413615d8245dad8914016fa /client/mysqladmin.c | |
| parent | 4ae5fd0b892748925b3899131adc2c192453f693 (diff) | |
| parent | 48edd0acae1154fce882e68a370fa630b1528390 (diff) | |
| download | mariadb-git-a456cfa1353e02978ff1d32c77afb9900c763890.tar.gz | |
Merge to update to recent tree version
BitKeeper/etc/logging_ok:
auto-union
client/mysqladmin.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'client/mysqladmin.c')
| -rw-r--r-- | client/mysqladmin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 00af8c592ec..e9572e0ad8d 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -731,7 +731,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) return 1; } if (argv[1][0]) - make_scrambled_password(crypted_pw,argv[1]); + make_scrambled_password(crypted_pw,argv[1],0); /* New passwords only */ else crypted_pw[0]=0; /* No password */ sprintf(buff,"set password='%s',sql_log_off=0",crypted_pw); |