diff options
| author | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-10-30 11:31:03 +0200 |
|---|---|---|
| committer | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-10-30 11:31:03 +0200 |
| commit | 200f0531eff80dd9ac24b8ba15af3e0009739f83 (patch) | |
| tree | f5e6986d61bf71321559f4a770993fbb5aa8da16 /sql/log_event.h | |
| parent | a3b60d2d5177f48ca82ef644e81f5b287b52f1ba (diff) | |
| parent | 5e314d06e67117b85d0e72f07c73b26fa0fb55d3 (diff) | |
| download | mariadb-git-200f0531eff80dd9ac24b8ba15af3e0009739f83.tar.gz | |
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
into koti.dsl.inet.fi:/home/elkin/MySQL/5.1-merge-bug27571
client/mysql.cc:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
mysql-test/suite/binlog/r/binlog_killed.result:
Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
mysql-test/suite/rpl/r/rpl_sp_effects.result:
manual merge ul
mysql-test/suite/rpl/t/rpl_sp_effects.test:
manual merge
sql/slave.cc:
leaving for manual merge
sql/sql_delete.cc:
leaving for manual merge
sql/sql_insert.cc:
leaving for manual merge
sql/sql_load.cc:
leaving for manual merge
sql/sql_update.cc:
leaving for manual merge
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index ab2424d8466..4bd496af2a4 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -2744,10 +2744,12 @@ public: #ifndef MYSQL_CLIENT Execute_load_query_log_event(THD* thd, const char* query_arg, - ulong query_length, uint fn_pos_start_arg, - uint fn_pos_end_arg, - enum_load_dup_handling dup_handling_arg, - bool using_trans, bool suppress_use); + ulong query_length, uint fn_pos_start_arg, + uint fn_pos_end_arg, + enum_load_dup_handling dup_handling_arg, + bool using_trans, bool suppress_use, + THD::killed_state + killed_err_arg= THD::KILLED_NO_VALUE); #ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); #endif /* HAVE_REPLICATION */ |