File tree Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -61,9 +61,10 @@ func (mc *mysqlConn) readPacket() ([]byte, error) {
6161 if err == nil {
6262 err = fmt .Errorf ("Length of read data (%d) does not match body length (%d)" , n , pktLen )
6363 }
64- errLog .Print (`packets:64 ` , err )
64+ errLog .Print (err )
6565 return nil , driver .ErrBadConn
6666 }
67+
6768 return data , err
6869}
6970
@@ -81,7 +82,7 @@ func (mc *mysqlConn) readNumber(nr uint8) (uint64, error) {
8182 if err == nil {
8283 err = fmt .Errorf ("Length of read data (%d) does not match header length (%d)" , n , nr )
8384 }
84- errLog .Print (`packets:84 ` , err )
85+ errLog .Print (err )
8586 return 0 , driver .ErrBadConn
8687 }
8788
@@ -100,7 +101,7 @@ func (mc *mysqlConn) writePacket(data *[]byte) error {
100101 if err == nil {
101102 err = errors .New ("Length of send data does not match packet length" )
102103 }
103- errLog .Print (`packets:103 ` , err )
104+ errLog .Print (err )
104105 return driver .ErrBadConn
105106 }
106107
@@ -442,7 +443,7 @@ The order of packets for a result set is:
442443func (mc * mysqlConn ) readResultSetHeaderPacket () (fieldCount int , err error ) {
443444 data , err := mc .readPacket ()
444445 if err != nil {
445- errLog .Print (`packets:446 ` , err )
446+ errLog .Print (err )
446447 err = driver .ErrBadConn
447448 return
448449 }
Original file line number Diff line number Diff line change @@ -24,12 +24,10 @@ import (
2424// Logger
2525var (
2626 errLog * log.Logger
27- dbgLog * log.Logger
2827)
2928
3029func init () {
31- errLog = log .New (os .Stderr , "[MySQL] " , log .LstdFlags )
32- dbgLog = log .New (os .Stdout , "[MySQL] " , log .LstdFlags )
30+ errLog = log .New (os .Stderr , "[MySQL] " , log .Ldate | log .Ltime | log .Lshortfile )
3331
3432 dsnPattern = regexp .MustCompile (
3533 `^(?:(?P<user>.*?)(?::(?P<passwd>.*))?@)?` + // [user[:password]@]
You can’t perform that action at this time.
0 commit comments