summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorVarun Gupta <varunraiko1803@gmail.com>2018-07-27 11:34:34 +0530
committerVarun Gupta <varunraiko1803@gmail.com>2018-07-27 11:34:34 +0530
commitbd0b368119b48ffbb1e5ab3cd2887270c5c6840e (patch)
tree76e7e9ed294cc84f5fe64fe3a4b468c7d54a9d99 /sql/sql_select.cc
parent37dee22d27c55c14f0be7005c3e5bdbb09e1fc92 (diff)
downloadmariadb-git-bd0b368119b48ffbb1e5ab3cd2887270c5c6840e.tar.gz
Fix added along with a test for a case missed in the patch for MDEV-16751
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 45a1372988b..b2b2bcde80c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -7445,11 +7445,11 @@ bool JOIN_TAB::keyuse_is_valid_for_access_in_chosen_plan(JOIN *join,
st_select_lex *sjm_sel= emb_sj_nest->sj_subq_pred->unit->first_select();
for (uint i= 0; i < sjm_sel->item_list.elements; i++)
{
- DBUG_ASSERT(sjm_sel->ref_pointer_array[i]->type() == Item::FIELD_ITEM);
- if (keyuse->val->type() == Item::FIELD_ITEM)
+ DBUG_ASSERT(sjm_sel->ref_pointer_array[i]->real_item()->type() == Item::FIELD_ITEM);
+ if (keyuse->val->real_item()->type() == Item::FIELD_ITEM)
{
- Field *field = ((Item_field*)sjm_sel->ref_pointer_array[i])->field;
- if (field->eq(((Item_field*)keyuse->val)->field))
+ Field *field = ((Item_field*)sjm_sel->ref_pointer_array[i]->real_item())->field;
+ if (field->eq(((Item_field*)keyuse->val->real_item())->field))
return true;
}
}