From cfff34f6aeaff23353e336a2caec60ccb67b40bd Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip@influxdb.com>
Date: Wed, 1 Apr 2015 14:20:14 -0700
Subject: [PATCH] Fix bad merge with master

---
 server.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server.go b/server.go
index 68837410a74..88fa8a042c8 100644
--- a/server.go
+++ b/server.go
@@ -2165,13 +2165,11 @@ func (s *Server) executeSelectStatement(statementID int, stmt *influxql.SelectSt
 	resultSent := false
 	for row := range ch {
 		if row.Err != nil {
-			res.Err = row.Err
 			return row.Err
 		} else {
 			resultSent = true
 			results <- &Result{StatementID: statementID, Series: []*influxql.Row{row}}
 		}
-		res.Series = append(res.Series, row)
 	}
 
 	if !resultSent {