compiler warning

item->val_int() == bool
MariaDB · May 11, 2018 · af68252 · af68252
1 parent e19915d
commit af68252
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
@@ -4529,7 +4529,7 @@ Item_cond::fix_fields(THD *thd, Item **ref)
   List_iterator<Item> li(list);
   Item *item;
   uchar buff[sizeof(char*)];			// Max local vars in function
-  bool is_and_cond= functype() == Item_func::COND_AND_FUNC;
+  longlong is_and_cond= functype() == Item_func::COND_AND_FUNC;
   not_null_tables_cache= 0;
   used_tables_and_const_cache_init();
 
@@ -4646,7 +4646,7 @@ bool
 Item_cond::eval_not_null_tables(void *opt_arg)
 {
   Item *item;
-  bool is_and_cond= functype() == Item_func::COND_AND_FUNC;
+  longlong is_and_cond= functype() == Item_func::COND_AND_FUNC;
   List_iterator<Item> li(list);
   not_null_tables_cache= (table_map) 0;
   and_tables_cache= ~(table_map) 0;