diff options
Diffstat (limited to 'vendor/github.com/go-sql-driver/mysql/infile.go')
| -rw-r--r-- | vendor/github.com/go-sql-driver/mysql/infile.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vendor/github.com/go-sql-driver/mysql/infile.go b/vendor/github.com/go-sql-driver/mysql/infile.go index 0c8af9f..3279dcf 100644 --- a/vendor/github.com/go-sql-driver/mysql/infile.go +++ b/vendor/github.com/go-sql-driver/mysql/infile.go @@ -93,7 +93,7 @@ func deferredClose(err *error, closer io.Closer) { const defaultPacketSize = 16 * 1024 // 16KB is small enough for disk readahead and large enough for TCP -func (mc *okHandler) handleInFileRequest(name string) (err error) { +func (mc *mysqlConn) handleInFileRequest(name string) (err error) { var rdr io.Reader var data []byte packetSize := defaultPacketSize @@ -116,10 +116,10 @@ func (mc *okHandler) handleInFileRequest(name string) (err error) { defer deferredClose(&err, cl) } } else { - err = fmt.Errorf("reader '%s' is <nil>", name) + err = fmt.Errorf("Reader '%s' is <nil>", name) } } else { - err = fmt.Errorf("reader '%s' is not registered", name) + err = fmt.Errorf("Reader '%s' is not registered", name) } } else { // File name = strings.Trim(name, `"`) @@ -154,7 +154,7 @@ func (mc *okHandler) handleInFileRequest(name string) (err error) { for err == nil { n, err = rdr.Read(data[4:]) if n > 0 { - if ioErr := mc.conn().writePacket(data[:4+n]); ioErr != nil { + if ioErr := mc.writePacket(data[:4+n]); ioErr != nil { return ioErr } } @@ -168,7 +168,7 @@ func (mc *okHandler) handleInFileRequest(name string) (err error) { if data == nil { data = make([]byte, 4) } - if ioErr := mc.conn().writePacket(data[:4]); ioErr != nil { + if ioErr := mc.writePacket(data[:4]); ioErr != nil { return ioErr } @@ -177,6 +177,6 @@ func (mc *okHandler) handleInFileRequest(name string) (err error) { return mc.readResultOK() } - mc.conn().readPacket() + mc.readPacket() return err } |