From 306ebf7b1c1b26b45e93fbcbbf248b3479142c41 Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com>
Date: Mon, 4 Jul 2005 03:42:33 +0300
Subject: Fixes during review of new code - Mostly indentation fixes - Added
 missing test - Ensure that Item_func_case() checks for stack overruns - Use
 real_item() instead of (Item_ref*) item - Fixed wrong error handling

myisam/mi_unique.c:
  Improved comments
myisam/myisampack.c:
  Updated version number
mysql-test/r/group_by.result:
  Added test that was lost during earlier merge
mysql-test/r/information_schema.result:
  Safety fix: Drop procedures before used
mysql-test/t/group_by.test:
  Added test that was lost during earlier merge
mysql-test/t/information_schema.test:
  Safety fix: Drop procedures before used
mysys/hash.c:
  Updated comment
sql/field.cc:
  false -> FALSE
sql/ha_ndbcluster.cc:
  Fix some style issues
  - No () around argument to 'case'
  - Space before ( in switch and if
  - Removed 'goto'
  - Added {}
  - Added () to make expressions easier to read
  - my_snprintf -> strmov
sql/handler.cc:
  if( -> if (
sql/item.cc:
  Indentation changes
sql/item.h:
  false -> FALSE
sql/item_cmpfunc.cc:
  Ensure that Item_func_case() check for stack overrun properly
sql/item_cmpfunc.h:
  Ensure that Item_func_case() check for stack overrun properly
sql/item_func.cc:
  Indentation fixes
  Fixed wrong goto label
sql/mysqld.cc:
  Remove test for opt_disable_networking as this flag can never be set here
sql/opt_range.cc:
  Simplify code
sql/sql_class.h:
  Move define out from middle of class definition
sql/sql_parse.cc:
  Remove extra empty lines
sql/sql_select.cc:
  use real_item() instead of (Item_ref*) item
  Modifed function comment to be align with others
  Simple optimization
sql/sql_union.cc:
  Portability fix:
  Don't use 'bool_variable|=...'
sql/sql_view.cc:
  Move List_iterator_fast out from loops (rewind is faster than creating a new itearator)
strings/ctype-utf8.c:
  if( -> if (
strings/ctype.c:
  Remove disabled code
strings/decimal.c:
  Indentation fixes
strings/xml.c:
  Indentation fixes
---
 sql/sql_union.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/sql_union.cc')

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 87b67a5127a..bf657ce5396 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -646,14 +646,14 @@ bool st_select_lex::cleanup()
 
   if (join)
   {
-    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);
 }
-- 
cgit v1.2.1