database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge from mysql-5.5-bugteam to mysql-5.5-runtime

Browse Source 
No conflicts
This commit is contained in:
Jon Olav Hauglid
2010-11-16 10:05:19 +01:00
parent a3d9a26d3b d6d16303cd
commit 0caa22b145
53 changed files with 2174 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_insert.cc
View File

@ -3515,6 +3515,9 @@ bool select_insert::send_eof()
error= (thd->locked_tables_mode <= LTM_LOCK_TABLES ?
table->file->ha_end_bulk_insert() : 0);
if (!error && thd->is_error())
error= thd->stmt_da->sql_errno();
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
@ -4058,7 +4061,7 @@ bool select_create::send_eof()
{
bool tmp=select_insert::send_eof();
if (tmp)
abort();
abort_result_set();
else
{
/*
@ -4090,7 +4093,7 @@ void select_create::abort_result_set()
DBUG_ENTER("select_create::abort_result_set");
/*
In select_insert::abort() we roll back the statement, including
In select_insert::abort_result_set() we roll back the statement, including
truncating the transaction cache of the binary log. To do this, we
pretend that the statement is transactional, even though it might
be the case that it was not.