diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:17:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:17:19 +0200 |
| commit | 226ca250ed841fa57c8b15e3a5174cec5bd961e6 (patch) | |
| tree | 5227221d70a69208effd1a652783100605b8442f /sql/sql_select.cc | |
| parent | b30bbb7d9a1c3855c901b74735660e49ab64a2a8 (diff) | |
| parent | 42fd53724420627da65c3862f0fef0acffca3241 (diff) | |
| download | mariadb-git-226ca250ed841fa57c8b15e3a5174cec5bd961e6.tar.gz | |
Merge 10.1 into 10.2
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 6253c39b777..c3acdf7415b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -15833,7 +15833,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; @@ -15847,7 +15847,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) |