Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'ncbo_integration_branch' of github.com:ncbo/4store into…

… ncbo_integration_branch
  • Loading branch information...
commit 151fbd1bd977055b5da5d24a444dc9f46634754e 2 parents 753ed52 + 2847d55
@msalvadores msalvadores authored
Showing with 5 additions and 3 deletions.
  1. +5 −3 src/frontend/results.c
View
8 src/frontend/results.c
@@ -2522,6 +2522,7 @@ nextrow: ;
return q->resrow;
} else if (q->row >= q->length) {
+ returng: ;
if (q->aggregate_order) {
while (q->offset_aggregate > 0) {
q->offset_aggregate--;
@@ -2573,7 +2574,6 @@ nextrow: ;
}
next_row++;
} while (next_row < q->length && !constrain_group);
-
if (constrain_group) {
while (next_row < q->length && groups->data[ord->data[next_row]] == group) {
if (apply_constraints(q,ord->data[next_row]))
@@ -2585,8 +2585,10 @@ nextrow: ;
next_row++;
goto nextgroup;
}
- } else
- return NULL;
+ } else {
+ goto returng;
+ //return NULL;
+ }
} else {
long len = fs_binding_length(q->bt);
grows = fs_rid_vector_new(len);
Please sign in to comment.
Something went wrong with that request. Please try again.