diff options
Diffstat (limited to 'sql/group_by_handler.cc')
| -rw-r--r-- | sql/group_by_handler.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sql/group_by_handler.cc b/sql/group_by_handler.cc index 326aad439ef..71703cf09b6 100644 --- a/sql/group_by_handler.cc +++ b/sql/group_by_handler.cc @@ -40,7 +40,7 @@ int Pushdown_query::execute(JOIN *join) { int err; ha_rows max_limit; - ha_rows *reset_limit= 0; + bool reset_limit= FALSE; Item **reset_item= 0; THD *thd= handler->thd; TABLE *table= handler->table; @@ -52,11 +52,11 @@ int Pushdown_query::execute(JOIN *join) if (store_data_in_temp_table) { max_limit= join->tmp_table_param.end_write_records; - reset_limit= &join->unit->select_limit_cnt; + reset_limit= TRUE; } else { - max_limit= join->unit->select_limit_cnt; + max_limit= join->unit->lim.get_select_limit(); if (join->unit->fake_select_lex) reset_item= &join->unit->fake_select_lex->select_limit; } @@ -97,7 +97,10 @@ int Pushdown_query::execute(JOIN *join) { int error; /* result < 0 if row was not accepted and should not be counted */ - if (unlikely((error= join->result->send_data(*join->fields)))) + if (unlikely((error= + join->result->send_data_with_check(*join->fields, + join->unit, + join->send_records)))) { handler->end_scan(); DBUG_RETURN(error < 0 ? 0 : -1); @@ -112,7 +115,7 @@ int Pushdown_query::execute(JOIN *join) break; // LIMIT reached join->do_send_rows= 0; // Calculate FOUND_ROWS() if (reset_limit) - *reset_limit= HA_POS_ERROR; + join->unit->lim.set_unlimited(); if (reset_item) *reset_item= 0; } |