diff options
| author | sergefp@mysql.com <> | 2006-08-24 20:56:28 +0400 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2006-08-24 20:56:28 +0400 |
| commit | 84e9cb794fd2a8bb8d4e6591f8079fd77cbc82f7 (patch) | |
| tree | ae2573a91c38dd2295e011d5649ed2ab94770422 /sql/item_subselect.cc | |
| parent | 1e9b5cead238a5951698294e62b7512495d86c60 (diff) | |
| parent | 848548e16f940e117bfde69613314307f441d995 (diff) | |
| download | mariadb-git-84e9cb794fd2a8bb8d4e6591f8079fd77cbc82f7.tar.gz | |
BUG#16255: Merge to 5.0
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 0f2ae71bf05..0ad517609c9 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1098,24 +1098,23 @@ Item_in_subselect::row_value_transformer(JOIN *join) DBUG_RETURN(RES_ERROR); Item *item_eq= new Item_func_eq(new - Item_direct_ref(&select_lex->context, - (*optimizer->get_cache())-> - addr(i), - (char *)"<no matter>", - (char *)in_left_expr_name), + Item_ref(&select_lex->context, + (*optimizer->get_cache())-> + addr(i), + (char *)"<no matter>", + (char *)in_left_expr_name), new - Item_direct_ref(&select_lex->context, - select_lex->ref_pointer_array + i, - (char *)"<no matter>", - (char *)"<list ref>") + Item_ref(&select_lex->context, + select_lex->ref_pointer_array + i, + (char *)"<no matter>", + (char *)"<list ref>") ); Item *item_isnull= new Item_func_isnull(new - Item_direct_ref(&select_lex->context, - select_lex-> - ref_pointer_array+i, - (char *)"<no matter>", - (char *)"<list ref>") + Item_ref(&select_lex->context, + select_lex->ref_pointer_array+i, + (char *)"<no matter>", + (char *)"<list ref>") ); having_item= and_items(having_item, @@ -1125,11 +1124,11 @@ Item_in_subselect::row_value_transformer(JOIN *join) new Item_is_not_null_test(this, new - Item_direct_ref(&select_lex->context, - select_lex-> - ref_pointer_array + i, - (char *)"<no matter>", - (char *)"<list ref>") + Item_ref(&select_lex->context, + select_lex-> + ref_pointer_array + i, + (char *)"<no matter>", + (char *)"<list ref>") ) ); item_having_part2->top_level_item(); @@ -1185,11 +1184,11 @@ Item_in_subselect::row_value_transformer(JOIN *join) new Item_is_not_null_test(this, new - Item_direct_ref(&select_lex->context, - select_lex-> - ref_pointer_array + i, - (char *)"<no matter>", - (char *)"<list ref>") + Item_ref(&select_lex->context, + select_lex-> + ref_pointer_array + i, + (char *)"<no matter>", + (char *)"<list ref>") ) ); item_isnull= new |