diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-12 17:51:56 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-12 17:51:56 -0400 |
| commit | 0b48fb08c6eb93696bbf909d5646fba7abea9a6c (patch) | |
| tree | 2ce95da8f21103f5b040ef3c6d172dfbc1ab64f2 /sql/sql_acl.cc | |
| parent | 21e525c5aea5618387ad968e878b7aef076b0747 (diff) | |
| download | mariadb-git-0b48fb08c6eb93696bbf909d5646fba7abea9a6c.tar.gz | |
Additional patch for 5.1 commit for Bug#14262.
sql/sp.cc:
Update binlog-writing scheme to 5.1 model.
sql/sql_acl.cc:
Update binlog-writing scheme to 5.1 model.
sql/sql_trigger.cc:
Update binlog-writing scheme to 5.1 model.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 28 |
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); |