From 4f8882f8936a6e6f4c842e9097fa079b6f478bfe Mon Sep 17 00:00:00 2001
From: Ilia Cimpoes <ilia.cimpoes@ellation.com>
Date: Fri, 19 Oct 2018 10:27:09 +0300
Subject: [PATCH 1/2] Call markBadConn in Ping method

---
 connection.go      |  2 +-
 connection_test.go | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/connection.go b/connection.go
index f74235519..12a382268 100644
--- a/connection.go
+++ b/connection.go
@@ -475,7 +475,7 @@ func (mc *mysqlConn) Ping(ctx context.Context) (err error) {
 	defer mc.finish()
 
 	if err = mc.writeCommandPacket(comPing); err != nil {
-		return
+		return mc.markBadConn(err)
 	}
 
 	return mc.readResultOK()
diff --git a/connection_test.go b/connection_test.go
index 352c54ed7..2a1c8e888 100644
--- a/connection_test.go
+++ b/connection_test.go
@@ -11,6 +11,8 @@ package mysql
 import (
 	"context"
 	"database/sql/driver"
+	"errors"
+	"net"
 	"testing"
 )
 
@@ -108,3 +110,48 @@ func TestCleanCancel(t *testing.T) {
 		}
 	}
 }
+
+func TestPingMarkBadConnection(t *testing.T) {
+	nc := badConnection{err: errors.New("boom")}
+	ms := &mysqlConn{
+		netConn:          nc,
+		buf:              newBuffer(nc),
+		maxAllowedPacket: defaultMaxAllowedPacket,
+	}
+
+	err := ms.Ping(context.Background())
+
+	if err != driver.ErrBadConn {
+		t.Errorf("expected driver.ErrBadConn, got  %#v", err)
+	}
+}
+
+func TestPingErrInvalidConn(t *testing.T) {
+	nc := badConnection{err: errors.New("failed to write"), n: 10}
+	ms := &mysqlConn{
+		netConn:          nc,
+		buf:              newBuffer(nc),
+		maxAllowedPacket: defaultMaxAllowedPacket,
+		closech:          make(chan struct{}),
+	}
+
+	err := ms.Ping(context.Background())
+
+	if err != ErrInvalidConn {
+		t.Errorf("expected ErrInvalidConn, got  %#v", err)
+	}
+}
+
+type badConnection struct {
+	n   int
+	err error
+	net.Conn
+}
+
+func (bc badConnection) Write(b []byte) (n int, err error) {
+	return bc.n, bc.err
+}
+
+func (bc badConnection) Close() error {
+	return nil
+}

From 04d3fc547d2c5f24ff5fd76dcd091ffd28756dde Mon Sep 17 00:00:00 2001
From: Ilia Cimpoes <ilia.cimpoes@ellation.com>
Date: Fri, 19 Oct 2018 18:35:37 +0300
Subject: [PATCH 2/2] Add myself to AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index fbe4ec442..3f322e802 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,6 +35,7 @@ Hanno Braun <mail at hannobraun.com>
 Henri Yandell <flamefew at gmail.com>
 Hirotaka Yamamoto <ymmt2005 at gmail.com>
 ICHINOSE Shogo <shogo82148 at gmail.com>
+Ilia Cimpoes <ichimpoesh at gmail.com>
 INADA Naoki <songofacandy at gmail.com>
 Jacek Szwec <szwec.jacek at gmail.com>
 James Harr <james.harr at gmail.com>