diff options
| author | unknown <anozdrin/alik@quad.opbmk> | 2008-03-28 14:40:11 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.opbmk> | 2008-03-28 14:40:11 +0300 |
| commit | 1abfb6e040c7c3b9b157d213cc4e46af3773ce20 (patch) | |
| tree | fe37fd28b0f89bc024512c0d2a69e82f3d7e2f5c /sql/item_subselect.cc | |
| parent | f4c65a0193b4d65b2a451b5d825c3a7273f89db8 (diff) | |
| parent | 0cf83bbf56f13c4391e557cee5271259aff64d19 (diff) | |
| download | mariadb-git-1abfb6e040c7c3b9b157d213cc4e46af3773ce20.tar.gz | |
Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 7b68d258d29..0ccadaf28da 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1288,7 +1288,11 @@ Item_in_subselect::row_value_transformer(JOIN *join) Item *item_having_part2= 0; for (uint i= 0; i < cols_num; i++) { - DBUG_ASSERT(left_expr->fixed && select_lex->ref_pointer_array[i]->fixed); + DBUG_ASSERT(left_expr->fixed && + select_lex->ref_pointer_array[i]->fixed || + (select_lex->ref_pointer_array[i]->type() == REF_ITEM && + ((Item_ref*)(select_lex->ref_pointer_array[i]))->ref_type() == + Item_ref::OUTER_REF)); if (select_lex->ref_pointer_array[i]-> check_cols(left_expr->element_index(i)->cols())) DBUG_RETURN(RES_ERROR); @@ -1362,7 +1366,11 @@ Item_in_subselect::row_value_transformer(JOIN *join) for (uint i= 0; i < cols_num; i++) { Item *item, *item_isnull; - DBUG_ASSERT(left_expr->fixed && select_lex->ref_pointer_array[i]->fixed); + DBUG_ASSERT(left_expr->fixed && + select_lex->ref_pointer_array[i]->fixed || + (select_lex->ref_pointer_array[i]->type() == REF_ITEM && + ((Item_ref*)(select_lex->ref_pointer_array[i]))->ref_type() == + Item_ref::OUTER_REF)); if (select_lex->ref_pointer_array[i]-> check_cols(left_expr->element_index(i)->cols())) DBUG_RETURN(RES_ERROR); |