summaryrefslogtreecommitdiff
path: root/client/mysqladmin.c
diff options
context:
space:
mode:
authorpeter@mysql.com <>2002-10-06 13:42:16 +0400
committerpeter@mysql.com <>2002-10-06 13:42:16 +0400
commitd21402052c05e94a0538941fb9f135291bf58b07 (patch)
treeec440e8cca80b5a48de9c9b085968243421b8b8d /client/mysqladmin.c
parentde57e9ba3520d2e6a8cf92908af5ef8c43bb6760 (diff)
downloadmariadb-git-d21402052c05e94a0538941fb9f135291bf58b07.tar.gz
One more commit to do the merge of new 4.1 tree
Diffstat (limited to 'client/mysqladmin.c')
-rw-r--r--client/mysqladmin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index 01e36509c30..81e7e7c05de 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);