diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-11-08 15:12:51 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-11-08 15:12:51 +0200 |
| commit | 34d29fca2d1089ca2468645080a042f1ec1dd6f5 (patch) | |
| tree | e2aaebbbb821a798edd9deae3915d681d81fee90 /sql/sql_select.cc | |
| parent | 2d3a2cfae6cde162c5720d3e397cc6b3bdfdc7b1 (diff) | |
| parent | de6eea8b6f320ccb59f533476d2056a737311226 (diff) | |
| download | mariadb-git-34d29fca2d1089ca2468645080a042f1ec1dd6f5.tar.gz | |
Merge from 3.23 to get fix for GROUP BY bug
sql/sql_select.cc:
Auto merged
innobase/row/row0mysql.c:
merge (user 4.1 version)
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 9914b422878..25587f0ada7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5415,6 +5415,8 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), } else { + if (end_of_records) + DBUG_RETURN(0); join->first_record=1; VOID(test_if_group_changed(join->group_fields)); } |