Skip to content

M
MariaDB
Commit 177f6c64 authored by cmiller@zippy.cornsilk.net's avatar cmiller@zippy.cornsilk.net
Browse files
Options

Additional patch for 5.1 commit for Bug#14262.

parent 1279acd9
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 21 deletions
sql/sp.cc
View file @ 177f6c64
...@@ -659,8 +659,8 @@ db_drop_routine(THD *thd, int type, sp_name *name) ...@@ -659,8 +659,8 @@ db_drop_routine(THD *thd, int type, sp_name *name)
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE); thd->binlog_query(THD::MYSQL_QUERY_TYPE,
mysql_bin_log.write(&qinfo); thd->query, thd->query_length, FALSE, FALSE);
} }
} }
...@@ -704,8 +704,8 @@ db_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics) ...@@ -704,8 +704,8 @@ db_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics)
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE); thd->binlog_query(THD::MYSQL_QUERY_TYPE,
mysql_bin_log.write(&qinfo); thd->query, thd->query_length, FALSE, FALSE);
} }
} }
......
sql/sql_acl.cc
View file @ 177f6c64
...@@ -3146,8 +3146,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list, ...@@ -3146,8 +3146,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE); thd->binlog_query(THD::MYSQL_QUERY_TYPE,
mysql_bin_log.write(&qinfo); thd->query, thd->query_length, FALSE, FALSE);
} }
} }
...@@ -3312,8 +3312,8 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc, ...@@ -3312,8 +3312,8 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE); thd->binlog_query(THD::MYSQL_QUERY_TYPE,
mysql_bin_log.write(&qinfo); thd->query, thd->query_length, FALSE, FALSE);
} }
} }
...@@ -3425,8 +3425,8 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, ...@@ -3425,8 +3425,8 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
thd->clear_error(); thd->clear_error();
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE); thd->binlog_query(THD::MYSQL_QUERY_TYPE,
mysql_bin_log.write(&qinfo); thd->query, thd->query_length, FALSE, FALSE);
} }
} }
...@@ -5438,8 +5438,8 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list) ...@@ -5438,8 +5438,8 @@ bool mysql_create_user(THD *thd, List <LEX_USER> &list)
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE); thd->binlog_query(THD::MYSQL_QUERY_TYPE,
mysql_bin_log.write(&qinfo); thd->query, thd->query_length, FALSE, FALSE);
} }
rw_unlock(&LOCK_grant); rw_unlock(&LOCK_grant);
...@@ -5501,8 +5501,8 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list) ...@@ -5501,8 +5501,8 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list)
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE); thd->binlog_query(THD::MYSQL_QUERY_TYPE,
mysql_bin_log.write(&qinfo); thd->query, thd->query_length, FALSE, FALSE);
} }
rw_unlock(&LOCK_grant); rw_unlock(&LOCK_grant);
...@@ -5577,8 +5577,8 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list) ...@@ -5577,8 +5577,8 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE); thd->binlog_query(THD::MYSQL_QUERY_TYPE,
mysql_bin_log.write(&qinfo); thd->query, thd->query_length, FALSE, FALSE);
} }
rw_unlock(&LOCK_grant); rw_unlock(&LOCK_grant);
...@@ -5758,8 +5758,8 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list) ...@@ -5758,8 +5758,8 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list)
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE); thd->binlog_query(THD::MYSQL_QUERY_TYPE,
mysql_bin_log.write(&qinfo); thd->query, thd->query_length, FALSE, FALSE);
} }
rw_unlock(&LOCK_grant); rw_unlock(&LOCK_grant);
......
sql/sql_trigger.cc
View file @ 177f6c64
...@@ -284,9 +284,8 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) ...@@ -284,9 +284,8 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
thd->clear_error(); thd->clear_error();
/* Such a statement can always go directly to binlog, no trans cache. */ /* Such a statement can always go directly to binlog, no trans cache. */
Query_log_event qinfo(thd, stmt_query.ptr(), stmt_query.length(), 0, thd->binlog_query(THD::MYSQL_QUERY_TYPE,
FALSE); stmt_query.ptr(), stmt_query.length(), FALSE, FALSE);
mysql_bin_log.write(&qinfo);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7