diff options
| author | monty@hundin.mysql.fi <> | 2002-05-16 23:35:09 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-05-16 23:35:09 +0300 |
| commit | 0c5c517db61c8d1e0753a310ec38d0c6b41827b2 (patch) | |
| tree | cbcb80b627d5f9bc7c0b27150bbdef3cd36d22aa /sql/sql_select.cc | |
| parent | f5ed8784a24f12262bd01be3df63d5c891adf306 (diff) | |
| download | mariadb-git-0c5c517db61c8d1e0753a310ec38d0c6b41827b2.tar.gz | |
Fixed some compilation problems in last changeset
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index d48bc3b3a18..06e0d94f524 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4967,6 +4967,11 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), } if (error > 0) DBUG_RETURN(-1); /* purecov: inspected */ + if (end_of_records) + { + join->send_records++; + DBUG_RETURN(0); + } if (!error && ++join->send_records >= join->thd->select_limit && join->do_send_rows) { @@ -4975,8 +4980,6 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), join->do_send_rows=0; join->thd->select_limit = HA_POS_ERROR; } - if (end_of_records) - DBUG_RETURN(0); } } else |