From 0b4db8addd6aa9fbb87d2cc8eac8331e69d1b0f2 Mon Sep 17 00:00:00 2001
From: unknown <jani@ua141d10.elisa.omakaista.fi>
Date: Wed, 4 Apr 2007 20:32:31 +0300
Subject: [PATCH] Fixed previous patch, wrong if() -test.

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

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 60cb4f09071..2445bccdc21 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3571,8 +3571,8 @@ end_with_restore_list:
         res= TRUE; // cannot happen
       else
       {
-        if ((thd->options & OPTION_KEEP_LOG) &&
-            thd->no_trans_update.all && !thd->slave_thread)
+        if (((thd->options & OPTION_KEEP_LOG) || thd->no_trans_update.all) &&
+            !thd->slave_thread)
           push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                        ER_WARNING_NOT_COMPLETE_ROLLBACK,
                        ER(ER_WARNING_NOT_COMPLETE_ROLLBACK));