support streaming resultsets in writeResultset

client/resp.go

@@ -306,6 +306,9 @@ func (c *Conn) readResultsetStreaming(data []byte, binary bool, result *Result,
 		result.Reset(int(columnCount))
 	}
 
+	// this is a streaming resultset
+	result.Resultset.Streaming = true
+
 	if err := c.readResultColumns(result); err != nil {
 		return errors.Trace(err)
 	}
@@ -320,6 +323,9 @@ func (c *Conn) readResultsetStreaming(data []byte, binary bool, result *Result,
 		return errors.Trace(err)
 	}
 
+	// this resultset is done streaming
+	result.Resultset.StreamingDone = true
+
 	return nil
 }
 

mysql/resultset.go

@@ -17,6 +17,9 @@ type Resultset struct {
 	RawPkg []byte
 
 	RowDatas []RowData
+
+	Streaming     bool
+	StreamingDone bool
 }
 
 var (

server/resp.go

@@ -116,6 +116,13 @@ func (c *Conn) writeAuthMoreDataFastAuth() error {
 }
 
 func (c *Conn) writeResultset(r *Resultset) error {
+	// for a streaming resultset, that handled rowdata separately in a callback
+	// of type SelectPerRowCallback, we can suffice by ending the stream with
+	// an EOF
+	if r.StreamingDone {
+		return c.writeEOF()
+	}
+
 	columnLen := PutLengthEncodedInt(uint64(len(r.Fields)))
 
 	data := make([]byte, 4, 1024)
@@ -137,6 +144,12 @@ func (c *Conn) writeResultset(r *Resultset) error {
 		return err
 	}
 
+	// streaming resultsets handle rowdata in a separate callback of type
+	// SelectPerRowCallback so we're done here
+	if r.Streaming {
+		return nil
+	}
+
 	for _, v := range r.RowDatas {
 		data = data[0:4]
 		data = append(data, v...)