remove traceLogger

Author: methane

compress.go

@@ -123,15 +123,15 @@ func (c *decompressor) uncompressPacket() error {
 	uncompressedLength := int(uint32(header[4]) | uint32(header[5])<<8 | uint32(header[6])<<16)
 	compressionSequence := uint8(header[3])
 	if debugTrace {
-		traceLogger.Printf("uncompress cmplen=%v uncomplen=%v pkt_cmp_seq=%v expected_cmp_seq=%v\n",
+		fmt.Printf("uncompress cmplen=%v uncomplen=%v pkt_cmp_seq=%v expected_cmp_seq=%v\n",
 			comprLength, uncompressedLength, compressionSequence, c.mc.sequence)
 	}
 	if compressionSequence != c.mc.sequence {
 		// return ErrPktSync
 		// server may return error packet (e.g. 1153 Got a packet bigger than 'max_allowed_packet' bytes)
 		// before receiving all packets from client. In this case, seqnr is younger than expected.
 		if debugTrace {
-			traceLogger.Printf("WARN: unexpected cmpress seq nr: expected %v, got %v",
+			fmt.Printf("WARN: unexpected cmpress seq nr: expected %v, got %v",
 				c.mc.sequence, compressionSequence)
 		}
 		// TODO(methane): report error when the packet is not an error packet.
@@ -219,7 +219,7 @@ func (mc *mysqlConn) writeCompressed(packets []byte) (int, error) {
 func (mc *mysqlConn) writeCompressedPacket(data []byte, uncompressedLen int) error {
 	comprLength := len(data) - 7
 	if debugTrace {
-		traceLogger.Printf(
+		fmt.Printf(
 			"writeCompressedPacket: comprLength=%v, uncompressedLen=%v, seq=%v",
 			comprLength, uncompressedLen, mc.compressSequence)
 	}

driver_test.go

@@ -3557,10 +3557,6 @@ func TestErrorInMultiResult(t *testing.T) {
 		t.Skipf("MySQL server not running on %s", netAddr)
 	}
 	// https://github.com/go-sql-driver/mysql/issues/1361
-	if !available {
-		t.Skipf("MySQL server not running on %s", netAddr)
-	}
-
 	var db *sql.DB
 	if _, err := ParseDSN(dsn); err != errInvalidDSNUnsafeCollation {
 		db, err = sql.Open("mysql", dsn)

errors.go

@@ -39,24 +39,11 @@ var (
 
 var defaultLogger = Logger(log.New(os.Stderr, "[mysql] ", log.Ldate|log.Ltime))
 
-// traceLogger is used for debug trace log.
-var traceLogger *log.Logger
-
-func init() {
-	if debugTrace {
-		traceLogger = log.New(os.Stderr, "[mysql.trace]", log.Lmicroseconds|log.Lshortfile)
-	}
-}
-
 // Logger is used to log critical error messages.
 type Logger interface {
 	Print(v ...any)
 }
 
-func (mc *mysqlConn) logf(format string, v ...any) {
-	mc.cfg.Logger.Print(fmt.Sprintf(format, v...))
-}
-
 // NopLogger is a nop implementation of the Logger interface.
 type NopLogger struct{}
 

packets.go

@@ -49,14 +49,14 @@ func (mc *mysqlConn) readPacket() ([]byte, error) {
 		if mc.compress {
 			// MySQL and MariaDB doesn't check packet nr in compressed packet.
 			if debugTrace && seqNr != mc.compressSequence {
-				mc.logf("[debug] mismatched compression sequence nr: expected: %v, got %v",
+				fmt.Printf("[debug] mismatched compression sequence nr: expected: %v, got %v",
 					mc.compressSequence, seqNr)
 			}
 			mc.compressSequence = seqNr + 1
 		} else {
 			// check packet sync [8 bit]
 			if seqNr != mc.sequence {
-				mc.logf("[warn] unexpected seq nr: expected %v, got %v", mc.sequence, seqNr)
+				mc.log(fmt.Sprintf("[warn] unexpected seq nr: expected %v, got %v", mc.sequence, seqNr))
 				// For large packets, we stop reading as soon as sync error.
 				if len(prevData) > 0 {
 					return nil, ErrPktSyncMul
@@ -133,7 +133,7 @@ func (mc *mysqlConn) writePacket(data []byte) error {
 
 		// Write packet
 		if debugTrace {
-			traceLogger.Printf("writePacket: size=%v seq=%v", size, mc.sequence)
+			fmt.Printf("writePacket: size=%v seq=%v", size, mc.sequence)
 		}
 		if mc.writeTimeout > 0 {
 			if err := mc.netConn.SetWriteDeadline(time.Now().Add(mc.writeTimeout)); err != nil {
@@ -228,7 +228,6 @@ func (mc *mysqlConn) readHandshakePacket() (data []byte, plugin string, err erro
 			return nil, "", ErrNoTLS
 		}
 	}
-
 	pos += 2
 
 	if len(data) > pos {
@@ -303,6 +302,7 @@ func (mc *mysqlConn) writeHandshakeResponsePacket(authResp []byte, plugin string
 	if mc.cfg.TLS != nil {
 		clientFlags |= clientSSL
 	}
+
 	if mc.cfg.MultiStatements {
 		clientFlags |= clientMultiStatements
 	}