diff options
| author | unknown <evgen@moonbone.local> | 2006-07-12 02:52:29 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-12 02:52:29 +0400 |
| commit | 03dbc2190dd33f7a5bb6b64e9fb153f977820abd (patch) | |
| tree | 07165c623571b01186e5ae84806d866fbbc971ea /sql/sql_select.cc | |
| parent | ca1e4aabfa9593dffe1ab6148e60fb303bad76de (diff) | |
| parent | d2bbf288a93ee50829e09d8faaf26dc0d6125476 (diff) | |
| download | mariadb-git-03dbc2190dd33f7a5bb6b64e9fb153f977820abd.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into moonbone.local:/work/18503-bug-4.1-mysql
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e9b7d954424..82c19255264 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -6780,8 +6780,13 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), { if (!join->first_record) { + List_iterator_fast<Item> it(*join->fields); + Item *item; /* No matching rows for group function */ join->clear(); + + while ((item= it++)) + item->no_rows_in_result(); } if (join->having && join->having->val_int() == 0) error= -1; // Didn't satisfy having |