diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 10:22:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 10:22:03 +0200 |
| commit | b006d2ead4640f0ab4e29687fd7d24988b1c98f1 (patch) | |
| tree | a478984bcd7f4bb2e0fd0496eae77b871077a380 /sql/item_subselect.cc | |
| parent | b782971c58b5656820429b8ef3fae5fd82f5a0f7 (diff) | |
| parent | dc09f8f29cb2b9fdce7d5d5a623fdc8dcf1814f9 (diff) | |
| download | mariadb-git-b006d2ead4640f0ab4e29687fd7d24988b1c98f1.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index bcc75131d02..a8051ccd469 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -2133,7 +2133,10 @@ Item_in_subselect::create_single_in_to_exists_cond(JOIN *join, } else { - Item *item= (Item*) select_lex->item_list.head()->real_item(); + Item *item= (Item*) select_lex->item_list.head(); + if (item->type() != REF_ITEM || + ((Item_ref*)item)->ref_type() != Item_ref::VIEW_REF) + item= item->real_item(); if (select_lex->table_list.elements) { @@ -5499,7 +5502,7 @@ int subselect_hash_sj_engine::exec() if (has_covering_null_row) { - DBUG_ASSERT(count_partial_match_columns = field_count); + DBUG_ASSERT(count_partial_match_columns == field_count); count_pm_keys= 0; } else if (has_covering_null_columns) |