diff options
author | guilhem@mysql.com <> | 2003-12-16 11:12:40 +0100 |
---|---|---|
committer | guilhem@mysql.com <> | 2003-12-16 11:12:40 +0100 |
commit | e56c8c61d83fce91fe6ff0da66e05b80255cfbf1 (patch) | |
tree | 9e3a84bc559ab75e424d51bc38089e2299d4faa0 /sql/sql_acl.cc | |
parent | 5310897786e927f7f3dfd028886d69b0e1add508 (diff) | |
parent | db2d812d1b2b554e10cebf9809e26d1d1dc4bbc9 (diff) | |
download | mariadb-git-e56c8c61d83fce91fe6ff0da66e05b80255cfbf1.tar.gz |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r-- | sql/sql_acl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index a395396be2d..6df636386d6 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1130,6 +1130,7 @@ bool change_password(THD *thd, const char *host, const char *user, acl_user->user ? acl_user->user : "", acl_user->host.hostname ? acl_user->host.hostname : "", new_password)); + thd->clear_error(); mysql_update_log.write(thd, buff, query_length); Query_log_event qinfo(thd, buff, query_length, 0); mysql_bin_log.write(&qinfo); |