diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-19 11:21:24 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-19 11:21:24 +0200 |
| commit | 80371ba644f8fefec52acca795ecd7528a9c00a3 (patch) | |
| tree | 2c2ad483bc3b231cd58c6b29bb7e1426ea14cd70 /sql/sql_delete.cc | |
| parent | 2c3a5626008f2589d4c2d9eac854a9098871d7f5 (diff) | |
| parent | 85e5ce0ba06b6a79e4bd7521ab0e44c1e63a3e77 (diff) | |
| download | mariadb-git-80371ba644f8fefec52acca795ecd7528a9c00a3.tar.gz | |
manual merge from mysql-5.1-bugteam
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index c94ea1302c8..00666bc85b4 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -59,6 +59,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, bool const_cond_result; ha_rows deleted= 0; bool reverse= FALSE; + bool skip_record; ORDER *order= (ORDER *) ((order_list && order_list->elements) ? order_list->first : NULL); uint usable_index= MAX_KEY; @@ -298,7 +299,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, { thd->examined_row_count++; // thd->is_error() is tested to disallow delete row on error - if (!(select && select->skip_record())&& ! thd->is_error() ) + if (!select || (!select->skip_record(thd, &skip_record) && !skip_record)) { if (table->triggers && |