diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-04-09 07:42:51 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-04-09 07:42:51 +0800 |
| commit | 85cff45ef791c411abd0782fcae77e2da7f532ec (patch) | |
| tree | 22e49a89755096df5a854d1016d5e19cc163820a /sql/sql_acl.cc | |
| parent | 440858b8167162e29d5f1619448768c93e870926 (diff) | |
| parent | 51a91166387760546d563ebf72bfa037fcff24a8 (diff) | |
| download | mariadb-git-85cff45ef791c411abd0782fcae77e2da7f532ec.tar.gz | |
Manually merge BUG#37145 to 5.1-bugteam
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index bd940608a07..b1dbb7031ce 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1647,7 +1647,8 @@ bool change_password(THD *thd, const char *host, const char *user, acl_user->host.hostname ? acl_user->host.hostname : "", new_password)); thd->clear_error(); - thd->binlog_query(THD::MYSQL_QUERY_TYPE, buff, query_length, FALSE, FALSE); + thd->binlog_query(THD::MYSQL_QUERY_TYPE, buff, query_length, + FALSE, FALSE, THD::NOT_KILLED); } end: close_thread_tables(thd); |