diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 17:43:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 17:43:59 +0200 |
| commit | 0bc42602266815b81fe86b08c2228912c1a95340 (patch) | |
| tree | 7379577fac279387ec64d9ec0d752db11b0e425c /sql/item_cmpfunc.cc | |
| parent | 7225bef7275da77faab316b863da0f4f5bf24a8f (diff) | |
| parent | 2d592f757cd624fe964ac39d05b6bdd985a827e2 (diff) | |
| download | mariadb-git-0bc42602266815b81fe86b08c2228912c1a95340.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 86725de8ae7..dcd48a679d7 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2016, MariaDB + Copyright (c) 2009, 2019, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4770,7 +4770,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 - longlong is_and_cond= functype() == Item_func::COND_AND_FUNC; + bool is_and_cond= functype() == Item_func::COND_AND_FUNC; not_null_tables_cache= 0; used_tables_and_const_cache_init(); @@ -4834,7 +4834,7 @@ Item_cond::fix_fields(THD *thd, Item **ref) if (item->const_item() && !item->with_param && !item->is_expensive() && !cond_has_datetime_is_null(item)) { - if (item->val_int() == is_and_cond && top_level()) + if (item->eval_const_cond() == is_and_cond && top_level()) { /* a. This is "... AND true_cond AND ..." @@ -4886,7 +4886,7 @@ bool Item_cond::eval_not_null_tables(void *opt_arg) { Item *item; - longlong is_and_cond= functype() == Item_func::COND_AND_FUNC; + bool 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; @@ -4896,7 +4896,7 @@ Item_cond::eval_not_null_tables(void *opt_arg) if (item->const_item() && !item->with_param && !item->is_expensive() && !cond_has_datetime_is_null(item)) { - if (item->val_int() == is_and_cond && top_level()) + if (item->eval_const_cond() == is_and_cond && top_level()) { /* a. This is "... AND true_cond AND ..." |