diff options
| author | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-11-06 13:27:48 +0200 |
|---|---|---|
| committer | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-11-06 13:27:48 +0200 |
| commit | b4db3f3f0a44292faaee43f01ef3ed2cc76cc5d9 (patch) | |
| tree | 4d9945968a0aacace42cebbeb5ffb9ffe422170c /sql/sql_insert.cc | |
| parent | c45171b01bdb93ebcffeb08c007a5dcfc0fe40e5 (diff) | |
| parent | 5e314d06e67117b85d0e72f07c73b26fa0fb55d3 (diff) | |
| download | mariadb-git-b4db3f3f0a44292faaee43f01ef3ed2cc76cc5d9.tar.gz | |
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
sql/sql_insert.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 724a9ec6b6d..65d8bb23706 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2938,6 +2938,7 @@ bool select_insert::send_eof() { int error, error2; bool changed, transactional_table= table->file->has_transactions(); + THD::killed_state killed_status= thd->killed; DBUG_ENTER("select_insert::send_eof"); error= (!thd->prelocked_mode) ? table->file->end_bulk_insert():0; @@ -2967,7 +2968,7 @@ bool select_insert::send_eof() if (!error) thd->clear_error(); Query_log_event qinfo(thd, thd->query, thd->query_length, - transactional_table, FALSE); + transactional_table, FALSE, killed_status); mysql_bin_log.write(&qinfo); } if ((error2=ha_autocommit_or_rollback(thd,error)) && ! error) |