diff options
| author | unknown <anozdrin/alik@quad.> | 2008-03-12 16:50:24 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.> | 2008-03-12 16:50:24 +0300 |
| commit | d80e7ce4e5e8aaae3473c617baaed5454bb520ed (patch) | |
| tree | fa6cb5ccb2c2c6148b51e2aa6110476b4634ed69 /sql/sql_delete.cc | |
| parent | d958f2984f4bbcea15fe675dd055de8d87ddd2b8 (diff) | |
| download | mariadb-git-d80e7ce4e5e8aaae3473c617baaed5454bb520ed.tar.gz | |
Fix manual merge.
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 24eb109e6d9..7c3a046cb20 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -129,9 +129,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, */ if (!using_limit && const_cond_result && !(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) && - !triggers_applicable && - !thd->current_stmt_binlog_row_based && - !table->triggers->has_delete_triggers()) + !(triggers_applicable && + thd->current_stmt_binlog_row_based && + table->triggers->has_delete_triggers())) { /* Update the table->file->stats.records number */ table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); |