diff options
author | Sven Sandberg <sven.sandberg@sun.com> | 2009-07-14 22:12:27 +0200 |
---|---|---|
committer | Sven Sandberg <sven.sandberg@sun.com> | 2009-07-14 22:12:27 +0200 |
commit | 45f724ec545837392f877eda27a803d473e8b59f (patch) | |
tree | 976db5058c7fdd791ea0d6dab9826f710269dbd0 /sql/sql_acl.cc | |
parent | 5b178e9a2af23226828f9c71fa6b1b82db319a9e (diff) | |
parent | f3985c649d65c2d932a6f74d22de3d2e6624d525 (diff) | |
download | mariadb-git-45f724ec545837392f877eda27a803d473e8b59f.tar.gz |
Merged fix for BUG#39934 up a few revisions.
NOTE: This undoes changes by BUG#42829 in sql_class.cc:binlog_query().
I will revert the change in a post-push fix (the binlog filter should
be checked in sql_base.cc:decide_logging_format()).
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 ab18a2d1d04..32382137d49 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1654,7 +1654,7 @@ 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, + thd->binlog_query(THD::STMT_QUERY_TYPE, buff, query_length, FALSE, FALSE, 0); } end: |