diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-04 13:25:19 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-04 13:25:19 +0200 |
| commit | b57e4dbd88671df86e2cf39aff5178976d710b64 (patch) | |
| tree | 32be2bfec3ca062c65566c60ecf59b673d1f97e9 /sql/sp_head.cc | |
| parent | 1a0c2153a036296785dcdfa7b5f4974515616e11 (diff) | |
| parent | 94efc1c6b084ed531b513e70fb66e7b7a1186b56 (diff) | |
| download | mariadb-git-b57e4dbd88671df86e2cf39aff5178976d710b64.tar.gz | |
Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:
bzr branch mysql-5.1-performance-version mysql-trunk # Summit
cd mysql-trunk
bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin
bzr rm innobase # remove the builtin
Next step: build, test fixes.
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 d6984bf5ad0..b7ad8c5c906 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1780,8 +1780,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) { |