Merge "third_party/go-sql-driver: Remove log statements that were added temporarily."
diff --git a/go/src/github.com/go-sql-driver/mysql/packets.go b/go/src/github.com/go-sql-driver/mysql/packets.go
index c738fa1..f2e385b 100644
--- a/go/src/github.com/go-sql-driver/mysql/packets.go
+++ b/go/src/github.com/go-sql-driver/mysql/packets.go
@@ -78,7 +78,6 @@
// Write packet buffer 'data'
func (mc *mysqlConn) writePacket(data []byte) error {
- errLog.Print("start: writePacket")
pktLen := len(data) - 4
if pktLen > mc.maxPacketAllowed {
@@ -101,13 +100,10 @@
data[3] = mc.sequence
// Write packet
- errLog.Print("start: mc.netConn.Write")
n, err := mc.netConn.Write(data[:4+size])
- errLog.Print("end: mc.netConn.Write")
if err == nil && n == 4+size {
mc.sequence++
if size != maxPacketSize {
- errLog.Print("end: writePacket")
return nil
}
pktLen -= size
@@ -422,9 +418,7 @@
// Result Set Header Packet
// http://dev.mysql.com/doc/internals/en/com-query-response.html#packet-ProtocolText::Resultset
func (mc *mysqlConn) readResultSetHeaderPacket() (int, error) {
- errLog.Print("start: mc.readPacket")
data, err := mc.readPacket()
- errLog.Print("end: mc.readPacket err:", err)
if err == nil {
switch data[0] {
@@ -432,7 +426,6 @@
return 0, mc.handleOkPacket(data)
case iERR:
- errLog.Print("err package recieved")
return 0, mc.handleErrorPacket(data)
case iLocalInFile:
diff --git a/go/src/github.com/go-sql-driver/mysql/statement.go b/go/src/github.com/go-sql-driver/mysql/statement.go
index 3031cf6..142ef54 100644
--- a/go/src/github.com/go-sql-driver/mysql/statement.go
+++ b/go/src/github.com/go-sql-driver/mysql/statement.go
@@ -40,9 +40,7 @@
return nil, driver.ErrBadConn
}
// Send command
- errLog.Print("start: stmt.writeExecutePacket")
err := stmt.writeExecutePacket(args)
- errLog.Print("end: stmt.writeExecutePacket")
if err != nil {
return nil, err
}
@@ -53,23 +51,17 @@
mc.insertId = 0
// Read Result
- errLog.Print("start: mc.readResultSetHeaderPacket")
resLen, err := mc.readResultSetHeaderPacket()
- errLog.Print("end: mc.readResultSetHeaderPacket")
if err == nil {
if resLen > 0 {
// Columns
- errLog.Print("start: mc.readUntilEOF columns")
err = mc.readUntilEOF()
- errLog.Print("end: mc.readUntilEOF columns")
if err != nil {
return nil, err
}
// Rows
- errLog.Print("start: mc.readUntilEOF rows")
err = mc.readUntilEOF()
- errLog.Print("end: mc.readUntilEOF rows")
}
if err == nil {
return &mysqlResult{
