diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-05-30 21:32:28 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-05-30 21:32:28 +0800 |
| commit | abf5f8dac2a0840687dc99816cbd68fb8c515e50 (patch) | |
| tree | a2efff0bf717227dce4199d6e283e4a7c112dfdd /sql/sp_head.cc | |
| parent | 88e84c1fbfe9b60eeb9c3d24745ee31cfe29c38b (diff) | |
| download | mariadb-git-abf5f8dac2a0840687dc99816cbd68fb8c515e50.tar.gz | |
BUG#41948 Query_log_event constructor needlessly contorted
Make the caller of Query_log_event, Execute_load_log_event
constructors and THD::binlog_query to provide the error code
instead of having the constructors to figure out the error code.
sql/log_event.cc:
Changed constructors of Query_log_event and Execute_load_log_event to accept the error code argument instead of figuring it out by itself
sql/log_event.h:
Changed constructors of Query_log_event and Execute_load_log_event to accept the error code argument
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 1dba8a45926..8a8a5b06cc1 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1779,8 +1779,9 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, thd->options= binlog_save_options; if (thd->binlog_evt_union.unioned_events) { + int errcode = query_error_code(thd, thd->killed == THD::NOT_KILLED); Query_log_event qinfo(thd, binlog_buf.ptr(), binlog_buf.length(), - thd->binlog_evt_union.unioned_events_trans, FALSE); + thd->binlog_evt_union.unioned_events_trans, FALSE, errcode); if (mysql_bin_log.write(&qinfo) && thd->binlog_evt_union.unioned_events_trans) { |