diff options
| author | Martin Hansson <martin.hansson@sun.com> | 2009-09-28 12:48:52 +0200 |
|---|---|---|
| committer | Martin Hansson <martin.hansson@sun.com> | 2009-09-28 12:48:52 +0200 |
| commit | 2dbe095c3aec3d77ee759f17e04b2039be3f9b4c (patch) | |
| tree | d88f88f90563288f1ce5a366556697f80bbdc567 /sql/sql_class.h | |
| parent | 96665fd9ccda9d9c129c5e421b10d00ccf78e5de (diff) | |
| download | mariadb-git-2dbe095c3aec3d77ee759f17e04b2039be3f9b4c.tar.gz | |
Bug#46958: Assertion in Diagnostics_area::set_ok_status,
trigger, merge table
The problem with break statements is that they have very
local effects. Hence a break statement within the inner loop
of a nested-loops join caused execution to proceed to the
next table even though a serious error occurred. The problem
was fixed by breaking out the inner loop into its own
method. The change empowers all errors to terminate the
execution.
The errors that will now halt multi-DELETE execution
altogether are
- triggers returning errors
- handler errors
- server being killed
mysql-test/r/delete.result:
Bug#46958: Test result.
mysql-test/t/delete.test:
Bug#46958: Test case.
sql/sql_class.h:
Bug#46958: New method declaration.
sql/sql_delete.cc:
Bug#46958: New method implementation.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index c38eb17f191..b0128244030 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2907,7 +2907,8 @@ public: bool send_data(List<Item> &items); bool initialize_tables (JOIN *join); void send_error(uint errcode,const char *err); - int do_deletes(); + int do_deletes(); + int do_table_deletes(TABLE *table, bool ignore); bool send_eof(); virtual void abort(); }; |