diff options
| author | unknown <monty@mysql.com> | 2004-03-04 18:16:10 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-04 18:16:10 +0200 |
| commit | 0b751edc57385e125415a3d0aa8f37ad772e7178 (patch) | |
| tree | 23e1c598bde21cc2cb86a6228f23c9965a8633f5 /sql/sql_update.cc | |
| parent | eadfe4ddfa810972daa323131f6cc1476eee8055 (diff) | |
| download | mariadb-git-0b751edc57385e125415a3d0aa8f37ad772e7178.tar.gz | |
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
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index d2ccd02051b..0a8530aa141 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -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"; |