From e57679c2041ea549a1f6f1a4c1d7198543522907 Mon Sep 17 00:00:00 2001
From: "anozdrin/alik@quad." <>
Date: Wed, 12 Mar 2008 16:50:24 +0300
Subject: [PATCH] Fix manual merge.

---
 sql/sql_delete.cc | 6 +++---
 1 file 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);