changed mc.buf == nil to mc.netConn == nil

Author: arnehormann

connection.go

@@ -99,7 +99,7 @@ func (mc *mysqlConn) handleParams() (err error) {
 }
 
 func (mc *mysqlConn) Begin() (driver.Tx, error) {
-	if mc.buf == nil {
+	if mc.netConn == nil {
 		return nil, errInvalidConn
 	}
 	err := mc.exec("START TRANSACTION")
@@ -111,9 +111,6 @@ func (mc *mysqlConn) Begin() (driver.Tx, error) {
 }
 
 func (mc *mysqlConn) Close() (err error) {
-	if mc.buf == nil {
-		return errInvalidConn
-	}
 	// Makes Close idempotent
 	if mc.netConn != nil {
 		mc.writeCommandPacket(comQuit)
@@ -128,7 +125,7 @@ func (mc *mysqlConn) Close() (err error) {
 }
 
 func (mc *mysqlConn) Prepare(query string) (driver.Stmt, error) {
-	if mc.buf == nil {
+	if mc.netConn == nil {
 		return nil, errInvalidConn
 	}
 	// Send command
@@ -159,7 +156,7 @@ func (mc *mysqlConn) Prepare(query string) (driver.Stmt, error) {
 }
 
 func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, error) {
-	if mc.buf == nil {
+	if mc.netConn == nil {
 		return nil, errInvalidConn
 	}
 	if len(args) == 0 { // no args, fastpath
@@ -203,7 +200,7 @@ func (mc *mysqlConn) exec(query string) error {
 }
 
 func (mc *mysqlConn) Query(query string, args []driver.Value) (driver.Rows, error) {
-	if mc.buf == nil {
+	if mc.netConn == nil {
 		return nil, errInvalidConn
 	}
 	if len(args) == 0 { // no args, fastpath

rows.go

@@ -37,7 +37,7 @@ func (rows *mysqlRows) Columns() []string {
 func (rows *mysqlRows) Close() (err error) {
 	// Remove unread packets from stream
 	if !rows.eof {
-		if rows.mc == nil || rows.mc.buf == nil {
+		if rows.mc == nil || rows.mc.netConn == nil {
 			return errInvalidConn
 		}
 
@@ -58,7 +58,7 @@ func (rows *mysqlRows) Next(dest []driver.Value) (err error) {
 		return io.EOF
 	}
 
-	if rows.mc == nil || rows.mc.buf == nil {
+	if rows.mc == nil || rows.mc.netConn == nil {
 		return errInvalidConn
 	}
 

statement.go

@@ -34,7 +34,7 @@ func (stmt *mysqlStmt) NumInput() int {
 }
 
 func (stmt *mysqlStmt) Exec(args []driver.Value) (driver.Result, error) {
-	if stmt.mc.buf == nil {
+	if stmt.mc.netConn == nil {
 		return nil, errInvalidConn
 	}
 	// Send command
@@ -73,7 +73,7 @@ func (stmt *mysqlStmt) Exec(args []driver.Value) (driver.Result, error) {
 }
 
 func (stmt *mysqlStmt) Query(args []driver.Value) (driver.Rows, error) {
-	if stmt.mc.buf == nil {
+	if stmt.mc.netConn == nil {
 		return nil, errInvalidConn
 	}
 	// Send command

transaction.go

@@ -13,7 +13,7 @@ type mysqlTx struct {
 }
 
 func (tx *mysqlTx) Commit() (err error) {
-	if tx.mc == nil || tx.mc.buf == nil {
+	if tx.mc == nil || tx.mc.netConn == nil {
 		return errInvalidConn
 	}
 	err = tx.mc.exec("COMMIT")
@@ -22,7 +22,7 @@ func (tx *mysqlTx) Commit() (err error) {
 }
 
 func (tx *mysqlTx) Rollback() (err error) {
-	if tx.mc == nil || tx.mc.buf == nil {
+	if tx.mc == nil || tx.mc.netConn == nil {
 		return errInvalidConn
 	}
 	err = tx.mc.exec("ROLLBACK")