mirror of
https://github.com/MariaDB/server.git
synced 2026-04-26 10:15:29 +02:00
Rollback UPDATE/DELETE statements on kill
nsure that rows in a multi-row INSERT DELAYED are inserted atomicly mysql-test/mysql-test-run.sh: Make test case safe for openserver/unixware (Bug #2700) sql/sql_delete.cc: Rollback statement on kill sql/sql_insert.cc: Ensure that rows in a multi-row INSERT DELAYED are inserted atomicly (without releasing logs). This is needed to ensure that the mysqlbinlog is consistent. Bug #2491 sql/sql_list.h: Ensure that rows in a multi-row INSERT DELAYED is inserted atomicly (without releasing logs). This is needed to ensure that the mysqlbinlog is consistent. Bug #2491 sql/sql_update.cc: Rollback statement on kill
This commit is contained in:
parent
eadfe4ddfa
commit
0b751edc57
5 changed files with 31 additions and 7 deletions
|
|
@ -238,6 +238,8 @@ int mysql_update(THD *thd,
|
|||
}
|
||||
}
|
||||
}
|
||||
if (thd->killed && !error)
|
||||
error= 1; // Aborted
|
||||
limit= tmp_limit;
|
||||
end_read_record(&info);
|
||||
/* Change select to use tempfile */
|
||||
|
|
@ -309,6 +311,8 @@ int mysql_update(THD *thd,
|
|||
else
|
||||
table->file->unlock_row();
|
||||
}
|
||||
if (thd->killed && !error)
|
||||
error= 1; // Aborted
|
||||
end_read_record(&info);
|
||||
free_io_cache(table); // If ORDER BY
|
||||
thd->proc_info="end";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue