diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
| commit | da4503e956ee067947e504c6e73052d9d906742c (patch) | |
| tree | a70bbc33f0411ef29c347a570d8253445d8013e4 /sql/item_subselect.cc | |
| parent | babbf8c6fc6da92cd1b2bb23f04e996f84b0ca1a (diff) | |
| parent | b000e169562697aa072600695d4f0c0412f94f4f (diff) | |
| download | mariadb-git-da4503e956ee067947e504c6e73052d9d906742c.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 198657636f6..a215092f30f 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1390,6 +1390,9 @@ Item_in_subselect::Item_in_subselect(Item * left_exp, DBUG_ENTER("Item_in_subselect::Item_in_subselect"); DBUG_PRINT("info", ("in_strategy: %u", (uint)in_strategy)); left_expr_orig= left_expr= left_exp; + /* prepare to possible disassembling the item in convert_subq_to_sj() */ + if (left_exp->type() == Item::ROW_ITEM) + left_expr_orig= new Item_row(left_exp); func= &eq_creator; init(select_lex, new select_exists_subselect(this)); max_columns= UINT_MAX; @@ -1413,6 +1416,9 @@ Item_allany_subselect::Item_allany_subselect(Item * left_exp, { DBUG_ENTER("Item_allany_subselect::Item_allany_subselect"); left_expr_orig= left_expr= left_exp; + /* prepare to possible disassembling the item in convert_subq_to_sj() */ + if (left_exp->type() == Item::ROW_ITEM) + left_expr_orig= new Item_row(left_exp); func= func_creator(all_arg); init(select_lex, new select_exists_subselect(this)); max_columns= 1; |