summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2006-10-12 17:51:56 -0400
committercmiller@zippy.cornsilk.net <>2006-10-12 17:51:56 -0400
commit177f6c64df1bf00ddef6093cc95c4abad164423b (patch)
tree2ce95da8f21103f5b040ef3c6d172dfbc1ab64f2 /sql/sql_acl.cc
parent1279acd975688f042cf60af1df54b13c48120132 (diff)
downloadmariadb-git-177f6c64df1bf00ddef6093cc95c4abad164423b.tar.gz
Additional patch for 5.1 commit for Bug#14262.
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 66e07c8cf46..aa13c2f08f4 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -3146,8 +3146,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
if (mysql_bin_log.is_open())
{
thd->clear_error();
- Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
- mysql_bin_log.write(&qinfo);
+ thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+ thd->query, thd->query_length, FALSE, FALSE);
}
}
@@ -3312,8 +3312,8 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
if (mysql_bin_log.is_open())
{
thd->clear_error();
- Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
- mysql_bin_log.write(&qinfo);
+ thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+ thd->query, thd->query_length, FALSE, FALSE);
}
}
@@ -3425,8 +3425,8 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
if (mysql_bin_log.is_open())
{
thd->clear_error();
- Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
- mysql_bin_log.write(&qinfo);
+ thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+ thd->query, thd->query_length, FALSE, FALSE);
}
}
@@ -5438,8 +5438,8 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list)
if (mysql_bin_log.is_open())
{
- Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
- mysql_bin_log.write(&qinfo);
+ thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+ thd->query, thd->query_length, FALSE, FALSE);
}
rw_unlock(&LOCK_grant);
@@ -5501,8 +5501,8 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list)
if (mysql_bin_log.is_open())
{
- Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
- mysql_bin_log.write(&qinfo);
+ thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+ thd->query, thd->query_length, FALSE, FALSE);
}
rw_unlock(&LOCK_grant);
@@ -5577,8 +5577,8 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
if (mysql_bin_log.is_open())
{
- Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
- mysql_bin_log.write(&qinfo);
+ thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+ thd->query, thd->query_length, FALSE, FALSE);
}
rw_unlock(&LOCK_grant);
@@ -5758,8 +5758,8 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list)
if (mysql_bin_log.is_open())
{
- Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
- mysql_bin_log.write(&qinfo);
+ thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+ thd->query, thd->query_length, FALSE, FALSE);
}
rw_unlock(&LOCK_grant);