From efaa28abb470495e86dff78de26b4f0019c736e2 Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@sun.com>
Date: Tue, 15 Dec 2009 10:31:49 +0300
Subject: [PATCH] Post-merge fix.

---
 sql/sql_delete.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 8ffc7bd1bc6..c59e7dd5873 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -1183,11 +1183,9 @@ end:
     {
       /* In RBR, the statement is not binlogged if the table is temporary. */
       if (!is_temporary_table || !thd->current_stmt_binlog_row_based)
-      {
         error= write_bin_log(thd, TRUE, thd->query(), thd->query_length());
-        if (!error)
-          my_ok(thd);		// This should return record count
-      }
+      if (!error)
+        my_ok(thd);		// This should return record count
     }
     pthread_mutex_lock(&LOCK_open);
     unlock_table_name(thd, table_list);