Post-merge fix.

efaa28ab · Alexander Nozdrin · 83aa3cf4 · efaa28ab
Commit efaa28ab authored Dec 15, 2009 by Alexander Nozdrin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

sql/sql_delete.cc sql/sql_delete.cc +2 -4

No files found.
--- 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)
+      if (!error)
-          my_ok(thd);		// This should return record count
+        my_ok(thd);		// This should return record count
-      }
    }
    pthread_mutex_lock(&LOCK_open);
    unlock_table_name(thd, table_list);