1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index c32c557a45e..c23f14e980b 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -656,14 +656,14 @@ bool st_select_lex::cleanup()
   if (join)
   {
     DBUG_ASSERT((st_select_lex*)join->select_lex == this);
-    error|= join->destroy();
+    error= join->destroy();
     delete join;
     join= 0;
   }
   for (SELECT_LEX_UNIT *lex_unit= first_inner_unit(); lex_unit ;
        lex_unit= lex_unit->next_unit())
   {
-    error|= lex_unit->cleanup();
+    error= (bool) ((uint) error | (uint) lex_unit->cleanup());
   }
   DBUG_RETURN(error);
 }