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/sql_select.cc | |
| parent | 7225bef7275da77faab316b863da0f4f5bf24a8f (diff) | |
| parent | 2d592f757cd624fe964ac39d05b6bdd985a827e2 (diff) | |
| download | mariadb-git-0bc42602266815b81fe86b08c2228912c1a95340.tar.gz | |
Merge 10.3 into 10.4
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 c8974721d09..e8b092b1b23 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -17066,7 +17066,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; @@ -17080,7 +17080,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) |