summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-07-29 13:00:32 +0300
committerunknown <bell@sanja.is.com.ua>2003-07-29 13:00:32 +0300
commit0792c1c8243d8b340a343586d0ea6bb8427691f6 (patch)
tree1da6fe8bf71777fc1964c8c397daf062b19f9d0c /sql/sql_derived.cc
parent329e063774537c14348a46c162afec79fc94d589 (diff)
downloadmariadb-git-0792c1c8243d8b340a343586d0ea6bb8427691f6.tar.gz
count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922)
removerd unused loop_id mysql-test/r/subselect.result: test of BUG#922 mysql-test/t/subselect.test: test of BUG#922 sql/item.cc: removerd unused loop_id we need count HAVING clause elements, because agregate function can be present in it sql/item.h: removerd unused loop_id sql/item_subselect.cc: new name of field sql/sql_derived.cc: new name of field sql/sql_lex.cc: new name of field sql/sql_lex.h: new name of field sql/sql_select.cc: new name of field sql/sql_union.cc: new name of field
Diffstat (limited to 'sql/sql_derived.cc')
-rw-r--r--sql/sql_derived.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index c61e8f42343..9ed26bc4062 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -126,7 +126,8 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit,
item_list= select_cursor->item_list;
select_cursor->with_wild= 0;
if (setup_ref_array(thd, &select_cursor->ref_pointer_array,
- (item_list.elements + select_cursor->select_items +
+ (item_list.elements +
+ select_cursor->select_n_having_items +
select_cursor->order_list.elements +
select_cursor->group_list.elements)) ||
setup_fields(thd, select_cursor->ref_pointer_array, first_table,