diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-16 23:35:09 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-16 23:35:09 +0300 |
| commit | 66f426c0635d16f7f594f6bf867e13e5cba18500 (patch) | |
| tree | cbcb80b627d5f9bc7c0b27150bbdef3cd36d22aa /sql/sql_select.cc | |
| parent | 4d094257dbb785d792785e610ab3cdf41eae9b8c (diff) | |
| download | mariadb-git-66f426c0635d16f7f594f6bf867e13e5cba18500.tar.gz | |
Fixed some compilation problems in last changeset
Docs/manual.texi:
Small changes regarind user resources
client/mysqlbinlog.cc:
Applied patch to support --database
mysql-test/r/func_isnull.result:
New test results
mysql-test/r/join.result:
New test results
mysql-test/r/show_check.result:
New test results
mysql-test/r/type_datetime.result:
New test results
mysql-test/r/type_decimal.result:
New test results
mysql-test/r/type_float.result:
New test results
mysys/my_gethostbyname.c:
Fixed type on last push
mysys/my_pthread.c:
Fixed type on last push
sql/sql_select.cc:
Fixed bug in LIMIT handling
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 |