firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 06:43:03 +01:00
Code Issues

Rollback to the prior revision, as the latest commit crashes the engine.

Browse Source
This commit is contained in:
dimitr 2009-12-14 09:17:05 +00:00
parent 97fb681f86
commit eb067509a6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jrd/recsrc/AggregatedStream.cpp
View File

@ -561,14 +561,18 @@ AggregatedStream::State AggregatedStream::evaluateGroup(thread_db* tdbb, Aggrega
}
// If vlux_count is non-zero, we need to fall through.
case nod_agg_count_distinct:
computeDistinct(tdbb, from);
// fall through
case nod_agg_count:
case nod_agg_count2:
case nod_agg_count_distinct:
if (from->nod_type == nod_agg_count_distinct)
{
computeDistinct(tdbb, from);
}
if (!impure->vlu_desc.dsc_dtype)
{
SET_NULL(record, id);
}
else
{
MOV_move(tdbb, &impure->vlu_desc, EVL_assign_to(tdbb, field));