From a08d258dc46a9c3831309b0b7ad276db2527248f Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Fri, 5 Apr 2019 14:59:20 +0900 Subject: [PATCH 1/3] fix appengine --- conncheck.go | 10 +++++----- conncheck_windows.go => conncheck_dummy.go | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) rename conncheck_windows.go => conncheck_dummy.go (93%) diff --git a/conncheck.go b/conncheck.go index fa868e84d..c8d7b3506 100644 --- a/conncheck.go +++ b/conncheck.go @@ -6,7 +6,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -// +build !windows +// +build !windows,!appengine package mysql @@ -14,7 +14,7 @@ import ( "errors" "io" "net" - "syscall" + "golang.org/x/sys/unix" ) var errUnexpectedRead = errors.New("unexpected read from socket") @@ -26,7 +26,7 @@ func connCheck(c net.Conn) error { buff [1]byte ) - sconn, ok := c.(syscall.Conn) + sconn, ok := c.(unix.Conn) if !ok { return nil } @@ -35,7 +35,7 @@ func connCheck(c net.Conn) error { return err } rerr := rc.Read(func(fd uintptr) bool { - n, err = syscall.Read(int(fd), buff[:]) + n, err = unix.Read(int(fd), buff[:]) return true }) switch { @@ -45,7 +45,7 @@ func connCheck(c net.Conn) error { return io.EOF case n > 0: return errUnexpectedRead - case err == syscall.EAGAIN || err == syscall.EWOULDBLOCK: + case err == unix.EAGAIN || err == unix.EWOULDBLOCK: return nil default: return err diff --git a/conncheck_windows.go b/conncheck_dummy.go similarity index 93% rename from conncheck_windows.go rename to conncheck_dummy.go index 3d9e63f66..fd01f64c9 100644 --- a/conncheck_windows.go +++ b/conncheck_dummy.go @@ -1,5 +1,3 @@ -package mysql - // Go MySQL Driver - A MySQL-Driver for Go's database/sql package // // Copyright 2019 The Go-MySQL-Driver Authors. All rights reserved. @@ -8,6 +6,10 @@ package mysql // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. +// +build windows appengine + +package mysql + import "net" func connCheck(c net.Conn) error { From 5735d912f898d494728b17f358b11e8498c79d12 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Fri, 5 Apr 2019 15:07:14 +0900 Subject: [PATCH 2/3] fix --- conncheck.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conncheck.go b/conncheck.go index c8d7b3506..0d681b193 100644 --- a/conncheck.go +++ b/conncheck.go @@ -14,7 +14,7 @@ import ( "errors" "io" "net" - "golang.org/x/sys/unix" + syscall "golang.org/x/sys/unix" ) var errUnexpectedRead = errors.New("unexpected read from socket") @@ -26,7 +26,7 @@ func connCheck(c net.Conn) error { buff [1]byte ) - sconn, ok := c.(unix.Conn) + sconn, ok := c.(syscall.Conn) if !ok { return nil } @@ -35,7 +35,7 @@ func connCheck(c net.Conn) error { return err } rerr := rc.Read(func(fd uintptr) bool { - n, err = unix.Read(int(fd), buff[:]) + n, err = syscall.Read(int(fd), buff[:]) return true }) switch { @@ -45,7 +45,7 @@ func connCheck(c net.Conn) error { return io.EOF case n > 0: return errUnexpectedRead - case err == unix.EAGAIN || err == unix.EWOULDBLOCK: + case err == syscall.EAGAIN || err == syscall.EWOULDBLOCK: return nil default: return err From ec93eeacb061a115e9dceec2a657be4dfb3c498a Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Fri, 5 Apr 2019 15:10:42 +0900 Subject: [PATCH 3/3] use syscall --- conncheck.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conncheck.go b/conncheck.go index 0d681b193..cc47aa559 100644 --- a/conncheck.go +++ b/conncheck.go @@ -14,7 +14,7 @@ import ( "errors" "io" "net" - syscall "golang.org/x/sys/unix" + "syscall" ) var errUnexpectedRead = errors.New("unexpected read from socket")