patch for group by + ordering + filter

ncbo · Mar 26, 2012 · 2847d55 · 2847d55
1 parent 935e22e
commit 2847d55
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/frontend/results.c b/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);