diff options
author | unknown <lars@mysql.com/black.(none)> | 2006-12-08 23:33:39 +0100 |
---|---|---|
committer | unknown <lars@mysql.com/black.(none)> | 2006-12-08 23:33:39 +0100 |
commit | cacaef6e44ed2fb7a42f5d3bfc713877a138a280 (patch) | |
tree | e603834affcc44ee4ccebccd7ce99351c3f56e77 /sql/sql_acl.cc | |
parent | d5e094d798a20c44d442c48061c9e314a26c20c4 (diff) | |
parent | a79858049e3b00b13879e79f4379d9e90de775f4 (diff) | |
download | mariadb-git-cacaef6e44ed2fb7a42f5d3bfc713877a138a280.tar.gz |
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
client/mysqldump.c:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_timezone.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysys/my_thr_init.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index ab39cb250f6..d08f4ea31a8 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1498,7 +1498,7 @@ bool change_password(THD *thd, const char *host, const char *user, { query_length= my_sprintf(buff, - (buff,"SET PASSWORD FOR \"%-.120s\"@\"%-.120s\"=\"%-.120s\"", + (buff,"SET PASSWORD FOR '%-.120s'@'%-.120s'='%-.120s'", acl_user->user ? acl_user->user : "", acl_user->host.hostname ? acl_user->host.hostname : "", new_password)); |