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 | c73c1812b62d05d0403dedcf58340fe5cdf7cf8e (patch) | |
| tree | f5e6986d61bf71321559f4a770993fbb5aa8da16 /sql/sql_insert.cc | |
| parent | f0470aa2295be588ef3d6f29e22dd04ff940e947 (diff) | |
| parent | c52e770669a1d993fe600fb23fd1b86e00e2ff99 (diff) | |
| download | mariadb-git-c73c1812b62d05d0403dedcf58340fe5cdf7cf8e.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/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 7e438ac3a7c..a631a82be1e 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3084,10 +3084,19 @@ void select_insert::send_error(uint errcode,const char *err) bool select_insert::send_eof() { +<<<<<<< gca sql/sql_insert.cc 1.146.1.105 + int error, error2; + bool changed, transactional_table= table->file->has_transactions(); +<<<<<<< local sql/sql_insert.cc 1.300 int error; bool const trans_table= table->file->has_transactions(); ulonglong id; bool changed; +<<<<<<< remote sql/sql_insert.cc 1.146.1.106 + int error, error2; + bool changed, transactional_table= table->file->has_transactions(); + THD::killed_state killed_status= thd->killed; +>>>>>>> DBUG_ENTER("select_insert::send_eof"); DBUG_PRINT("enter", ("trans_table=%d, table_type='%s'", trans_table, table->file->table_type())); @@ -3120,6 +3129,14 @@ bool select_insert::send_eof() { if (!error) thd->clear_error(); +<<<<<<< gca sql/sql_insert.cc 1.146.1.105 + Query_log_event qinfo(thd, thd->query, thd->query_length, + transactional_table, FALSE); + mysql_bin_log.write(&qinfo); + } + if ((error2=ha_autocommit_or_rollback(thd,error)) && ! error) + error=error2; +<<<<<<< local sql/sql_insert.cc 1.300 thd->binlog_query(THD::ROW_QUERY_TYPE, thd->query, thd->query_length, trans_table, FALSE); @@ -3138,6 +3155,14 @@ bool select_insert::send_eof() } table->file->ha_release_auto_increment(); +<<<<<<< remote sql/sql_insert.cc 1.146.1.106 + Query_log_event qinfo(thd, thd->query, thd->query_length, + transactional_table, FALSE, killed_status); + mysql_bin_log.write(&qinfo); + } + if ((error2=ha_autocommit_or_rollback(thd,error)) && ! error) + error=error2; +>>>>>>> if (error) { table->file->print_error(error,MYF(0)); |