diff --git a/connection.go b/connection.go index 5648e47d..3b69f7f9 100644 --- a/connection.go +++ b/connection.go @@ -357,6 +357,7 @@ func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, err // try to interpolate the parameters to save extra roundtrips for preparing and closing a statement prepared, err := mc.interpolateParams(query, args) if err != nil { + mc.log(err.Error()) return nil, err } query = prepared @@ -367,6 +368,7 @@ func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, err copied := mc.result return &copied, err } + mc.log(err.Error()) return nil, mc.markBadConn(err) } @@ -375,23 +377,27 @@ func (mc *mysqlConn) exec(query string) error { handleOk := mc.clearResult() // Send command if err := mc.writeCommandPacketStr(comQuery, query); err != nil { + mc.log(err.Error()) return mc.markBadConn(err) } // Read Result resLen, _, err := handleOk.readResultSetHeaderPacket() if err != nil { + mc.log(err.Error()) return err } if resLen > 0 { // columns if err := mc.skipColumns(resLen); err != nil { + mc.log(err.Error()) return err } // rows if err := mc.skipRows(); err != nil { + mc.log(err.Error()) return err } } @@ -416,6 +422,7 @@ func (mc *mysqlConn) query(query string, args []driver.Value) (*textRows, error) // try client-side prepare to reduce roundtrip prepared, err := mc.interpolateParams(query, args) if err != nil { + mc.log(err.Error()) return nil, err } query = prepared @@ -423,6 +430,7 @@ func (mc *mysqlConn) query(query string, args []driver.Value) (*textRows, error) // Send command err := mc.writeCommandPacketStr(comQuery, query) if err != nil { + mc.log(err.Error()) return nil, mc.markBadConn(err) } @@ -430,6 +438,7 @@ func (mc *mysqlConn) query(query string, args []driver.Value) (*textRows, error) var resLen int resLen, _, err = handleOk.readResultSetHeaderPacket() if err != nil { + mc.log(err.Error()) return nil, err } @@ -508,12 +517,14 @@ func (mc *mysqlConn) Ping(ctx context.Context) (err error) { } if err = mc.watchCancel(ctx); err != nil { + mc.log(err.Error()) return } defer mc.finish() handleOk := mc.clearResult() if err = mc.writeCommandPacket(comPing); err != nil { + mc.log(err.Error()) return mc.markBadConn(err) } @@ -567,10 +578,12 @@ func (mc *mysqlConn) QueryContext(ctx context.Context, query string, args []driv func (mc *mysqlConn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) { dargs, err := namedValueToValue(args) if err != nil { + mc.log(err.Error()) return nil, err } if err := mc.watchCancel(ctx); err != nil { + mc.log(err.Error()) return nil, err } defer mc.finish() diff --git a/packets.go b/packets.go index 6ef5a3e2..fc9c7bd6 100644 --- a/packets.go +++ b/packets.go @@ -31,6 +31,7 @@ func (mc *mysqlConn) readNext(n int) ([]byte, error) { if mc.buf.len() < n { err := mc.buf.fill(n, mc.readWithTimeout) if err != nil { + mc.log(err) return nil, err } } @@ -53,6 +54,7 @@ func (mc *mysqlConn) readPacket() ([]byte, error) { if err != nil { mc.close() if cerr := mc.canceled.Value(); cerr != nil { + mc.log(cerr) return nil, cerr } mc.log(err) @@ -95,6 +97,7 @@ func (mc *mysqlConn) readPacket() ([]byte, error) { if err != nil { mc.close() if cerr := mc.canceled.Value(); cerr != nil { + mc.log(cerr) return nil, cerr } mc.log(err)