proper affectedRows

methane · Feb 25, 2013 · 9e96191 · 9e96191
1 parent 8416bd0
commit 9e96191
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/connection.go b/connection.go
@@ -176,10 +176,13 @@ func (mc *mysqlConn) exec(query string) (err error) {
  return
  }
 
- mc.affectedRows, err = mc.readUntilEOF()
- if err != nil {
+ if mc.affectedRows > 0 {
+  _, err = mc.readUntilEOF()
  return
  }
+
+ mc.affectedRows, err = mc.readUntilEOF()
+ return
  }
 
  return

diff --git a/packets.go b/packets.go
@@ -406,24 +406,23 @@ func (mc *mysqlConn) handleOkPacket(data []byte) (err error) {
  // Position
  pos := 1
 
+ var n int
+
  // Affected rows [Length Coded Binary]
- affectedRows, n, err := bytesToLengthCodedBinary(data[pos:])
+ mc.affectedRows, n, err = bytesToLengthCodedBinary(data[pos:])
  if err != nil {
  return
  }
  pos += n
 
  // Insert id [Length Coded Binary]
- insertID, n, err := bytesToLengthCodedBinary(data[pos:])
+ mc.insertId, n, err = bytesToLengthCodedBinary(data[pos:])
  if err != nil {
  return
  }
 
  // Skip remaining data
 
- mc.affectedRows = affectedRows
- mc.insertId = insertID
-
  return
 }
 
@@ -602,7 +601,6 @@ func (mc *mysqlConn) readRow(columnsCount int) (*[]*[]byte, error) {
  pos += n
  }
 
- mc.affectedRows++
  return &row, nil
 }
 
@@ -1035,6 +1033,5 @@ func (mc *mysqlConn) readBinaryRow(rc *mysqlRows) (*[]*[]byte, error) {
  }
  }
 
- mc.affectedRows++
  return &row, nil
 }