From 6eb6e6a993c8b82a8342f88c41d6d0e85ff1be31 Mon Sep 17 00:00:00 2001
From: Todd Persen <todd.persen@gmail.com>
Date: Sat, 25 Oct 2014 23:18:36 -0400
Subject: [PATCH] Return nil when we're supposed to stop processing points.

Fix #821
---
 CHANGELOG.md       | 9 ++++++++-
 datastore/shard.go | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c4fe69de16..ad0b294cf24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
-## V0.8.4-rc.2 [unreleased]
+## v0.8.5 [unreleased]
+
+### Bugfixes
+
+- [Issue #821](https://github.com/influxdb/influxdb/issues/821). Don't
+  scan through points when we hit the limit
+
+## v0.8.4-rc.2 [2014-10-24]
 
 ### Bugfixes
 
diff --git a/datastore/shard.go b/datastore/shard.go
index 730da53c5e4..99d9c0a8875 100644
--- a/datastore/shard.go
+++ b/datastore/shard.go
@@ -209,6 +209,7 @@ func (self *Shard) executeQueryForSeries(querySpec *parser.QuerySpec, name strin
 					log.Error("Error while processing data: %v", err)
 					return err
 				}
+				return nil
 			}
 			seriesOutgoing = &protocol.Series{Name: protocol.String(name), Fields: columns, Points: make([]*protocol.Point, 0, self.pointBatchSize)}
 		}