database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Additional patch for 5.1 commit for Bug#14262.

Browse Source
This commit is contained in:
cmiller@zippy.cornsilk.net
2006-10-12 17:51:56 -04:00
parent 1279acd975
commit 177f6c64df
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sp.cc
View File

@ -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)
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);
} }
} }

28
sql/sql_acl.cc
View File

@ -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,
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,
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)
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)
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)
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)
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);

5
sql/sql_trigger.cc
View File

@ -284,9 +284,8 @@ end:
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);
} }
} }