database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

Browse Source 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
This commit is contained in:
lars/lthalmann@dl145j.mysql.com
2007-05-31 10:23:37 +02:00
parent b2d394787e 4835204dcc
commit 73ca08a481
31 changed files with 1091 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_class.cc
View File

@@ -3082,9 +3082,9 @@ void THD::binlog_delete_pending_rows_event()
RETURN VALUE
Error code, or 0 if no error.
*/
int THD::binlog_query(THD::enum_binlog_query_type qtype,
char const *query, ulong query_len,
bool is_trans, bool suppress_use)
int THD::binlog_query(THD::enum_binlog_query_type qtype, char const *query,
ulong query_len, bool is_trans, bool suppress_use,
THD::killed_state killed_status_arg)
{
DBUG_ENTER("THD::binlog_query");
DBUG_PRINT("enter", ("qtype=%d, query='%s'", qtype, query));
@@ -3123,7 +3123,8 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype,
flush the pending rows event if necessary.
*/
{
Query_log_event qinfo(this, query, query_len, is_trans, suppress_use);
Query_log_event qinfo(this, query, query_len, is_trans, suppress_use,
killed_status_arg);
qinfo.flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F;
/*
Binlog table maps will be irrelevant after a Query_log_event