diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
| commit | ffc69dbd05d31f016f3ac53be9d878ce133e60d6 (patch) | |
| tree | 056faecdd7c90011e5729943725cd038019bc683 /sql/sql_select.cc | |
| parent | dbc0d576a3f402ae52423fe424ed0a68f49537ef (diff) | |
| parent | ac4934535daadba0a45ffa407a7643ca3ff2712a (diff) | |
| download | mariadb-git-ffc69dbd05d31f016f3ac53be9d878ce133e60d6.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6915d4d23ca..1c9bfa397d2 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -16371,7 +16371,7 @@ Item::remove_eq_conds(THD *thd, Item::cond_result *cond_value, bool top_level_ar { if (const_item() && !is_expensive()) { - *cond_value= eval_const_cond(this) ? Item::COND_TRUE : Item::COND_FALSE; + *cond_value= eval_const_cond() ? Item::COND_TRUE : Item::COND_FALSE; return (COND*) 0; } *cond_value= Item::COND_OK; @@ -16385,7 +16385,7 @@ Item_bool_func2::remove_eq_conds(THD *thd, Item::cond_result *cond_value, { if (const_item() && !is_expensive()) { - *cond_value= eval_const_cond(this) ? Item::COND_TRUE : Item::COND_FALSE; + *cond_value= eval_const_cond() ? Item::COND_TRUE : Item::COND_FALSE; return (COND*) 0; } if ((*cond_value= eq_cmp_result()) != Item::COND_OK) |