Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2

This commit is contained in:
James 2014-08-22 10:56:16 +02:00
parent 3987067339 7d60eff20d
commit 8d31137698
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Aql/ExecutionBlock.cpp
View File

@ -1430,13 +1430,13 @@ int FilterBlock::getOrSkipSome (size_t atLeast,
else { else {
// The current block fits into our result and is fresh and // The current block fits into our result and is fresh and
// takes them all, so we can just hand it on: // takes them all, so we can just hand it on:
skipped += cur->size();
if (! skipping) { if (! skipping) {
collector.push_back(cur); collector.push_back(cur);
} }
else { else {
delete cur; delete cur;
} }
skipped += cur->size();
_buffer.pop_front(); _buffer.pop_front();
_chosen.clear(); _chosen.clear();
_pos = 0; _pos = 0;