diff options
| author | bell@sanja.is.com.ua <> | 2004-05-04 16:37:04 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-05-04 16:37:04 +0300 |
| commit | c2f194f243314ae3dcd5926dd26f0f686508c75f (patch) | |
| tree | 38e4ab41fe19b25659ddcdc8992863d1001e9251 /sql/sql_select.cc | |
| parent | 5de8c225e288daa80abec8d2d1bd3e461435a7c8 (diff) | |
| download | mariadb-git-c2f194f243314ae3dcd5926dd26f0f686508c75f.tar.gz | |
repetable test replaced with inline function
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 119cdf94401..f850c2ac270 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1122,9 +1122,7 @@ JOIN::exec() if (zero_result_cause) { (void) return_zero_rows(this, result, tables_list, fields_list, - do_send_rows && - tmp_table_param.sum_func_count != 0 && - !group_list, + send_row_on_empty_set(), select_options, zero_result_cause, having, procedure, @@ -5674,8 +5672,7 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure) if (!(error=(*end_select)(join,join_tab,0)) || error == -3) error=(*end_select)(join,join_tab,1); } - else if (join->do_send_rows && join->tmp_table_param.sum_func_count != 0 && - !join->group_list) + else if (join->send_row_on_empty_set()) error= join->result->send_data(*join->fields); } else |