diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:15:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:15:47 +0200 |
| commit | af682525a86960480bc9e14d954b15995343ffc8 (patch) | |
| tree | c5f88b6e651a58bfc9a4375f986e06e3c808e47b /sql/item_cmpfunc.cc | |
| parent | e19915d5d282901a026e0659028e48e20544565f (diff) | |
| download | mariadb-git-af682525a86960480bc9e14d954b15995343ffc8.tar.gz | |
compiler warning
item->val_int() == bool
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index a912c834f94..afa68fc5df3 100644 --- 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; |