Fixed previous patch, wrong if() -test.

6b61a509 · jani@ua141d10.elisa.omakaista.fi · e4fde449 · 6b61a509
Commit 6b61a509 authored Apr 04, 2007 by jani@ua141d10.elisa.omakaista.fi
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_parse.cc sql/sql_parse.cc +2 -2

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3571,8 +3571,8 @@ mysql_execute_command(THD *thd)
        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));