mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed LP bug #609121

Browse source 
Post-review fix - avoid re-evaluation of the having clause
when it evaluates to true.
This commit is contained in:
unknown 2010-10-27 12:35:15 +03:00
parent a09e5f504a
commit 3b11e4f834
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sql/sql_select.cc
View file

@ -12652,9 +12652,12 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure)
} }
else if (join->send_row_on_empty_set()) else if (join->send_row_on_empty_set())
{ {
List<Item> *columns_list= (procedure ? &join->procedure_fields_list : if (!join->having || join->having->val_int())
fields); {
rc= join->result->send_data(*columns_list); List<Item> *columns_list= (procedure ? &join->procedure_fields_list :
fields);
rc= join->result->send_data(*columns_list);
}
} }
} }
else else

3
sql/sql_select.h
View file

@ -1722,8 +1722,7 @@ public:
bool send_row_on_empty_set() bool send_row_on_empty_set()
{ {
return (do_send_rows && tmp_table_param.sum_func_count != 0 && return (do_send_rows && tmp_table_param.sum_func_count != 0 &&
!group_list && having_value != Item::COND_FALSE && !group_list && having_value != Item::COND_FALSE);
(!having || having->val_int()));
} }
bool change_result(select_result *result); bool change_result(select_result *result);
bool is_top_level_join() const bool is_top_level_join() const