Fix bad merge with master

influxdata · Apr 1, 2015 · cfff34f · cfff34f
1 parent 85121cc
commit cfff34f
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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 {