diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-03-16 16:30:09 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-03-16 16:30:09 +0200 |
| commit | 1a886333d63c0cd23b438b4d77445f2045904c03 (patch) | |
| tree | 127af1d44e1d5a90047576ec72f59f43d67610cf /sql/item_subselect.cc | |
| parent | efecd744f9d0435251486d0b2b2bae2ffb95692c (diff) | |
| parent | ae998fe080b8c5ed11e549a137b4496e1beb9e24 (diff) | |
| download | mariadb-git-1a886333d63c0cd23b438b4d77445f2045904c03.tar.gz | |
fix test during merge
sql/item_subselect.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index c5fdd79279d..deb1ebabef9 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -741,9 +741,9 @@ Item_in_subselect::single_value_transformer(JOIN *join, select_lex->ref_pointer_array[0]= select_lex->item_list.head(); if (select_lex->table_list.elements) { - Item *having= item, *isnull= item; + Item *having= item, *orig_item= item; item= func->create(expr, item); - if (!abort_on_null) + if (!abort_on_null && orig_item->maybe_null) { having= new Item_is_not_null_test(this, having); /* @@ -763,7 +763,7 @@ Item_in_subselect::single_value_transformer(JOIN *join, } select_lex->having_fix_field= 0; item= new Item_cond_or(item, - new Item_func_isnull(isnull)); + new Item_func_isnull(orig_item)); } item->name= (char *)in_additional_cond; /* |