Skip to content

Commit 76ee08f

Browse files
committed
now that tests passed, turn on by default, test with it off
1 parent 19e6e0e commit 76ee08f

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

client/auth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@ func (c *Conn) writeAuthHandshake() error {
210210
// Set default client capabilities that reflect the abilities of this library
211211
capability := mysql.CLIENT_PROTOCOL_41 | mysql.CLIENT_SECURE_CONNECTION |
212212
mysql.CLIENT_LONG_PASSWORD | mysql.CLIENT_TRANSACTIONS | mysql.CLIENT_PLUGIN_AUTH |
213-
mysql.CLIENT_LONG_FLAG | mysql.CLIENT_QUERY_ATTRIBUTES
213+
mysql.CLIENT_LONG_FLAG | mysql.CLIENT_QUERY_ATTRIBUTES | mysql.CLIENT_DEPRECATE_EOF
214214
// Adjust client capability flags on specific client requests
215215
// Only flags that would make any sense setting and aren't handled elsewhere
216216
// in the library are supported here
217217
capability |= c.ccaps&mysql.CLIENT_FOUND_ROWS | c.ccaps&mysql.CLIENT_IGNORE_SPACE |
218218
c.ccaps&mysql.CLIENT_MULTI_STATEMENTS | c.ccaps&mysql.CLIENT_MULTI_RESULTS |
219219
c.ccaps&mysql.CLIENT_PS_MULTI_RESULTS | c.ccaps&mysql.CLIENT_CONNECT_ATTRS |
220220
c.ccaps&mysql.CLIENT_COMPRESS | c.ccaps&mysql.CLIENT_ZSTD_COMPRESSION_ALGORITHM |
221-
c.ccaps&mysql.CLIENT_LOCAL_FILES | c.ccaps&mysql.CLIENT_DEPRECATE_EOF
221+
c.ccaps&mysql.CLIENT_LOCAL_FILES
222222

223223
capability &^= c.clientExplicitOffCaps
224224

client/client_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,18 @@ func (s *clientTestSuite) TestConn_Compress() {
101101
require.NoError(s.T(), err)
102102
}
103103

104+
func (s *clientTestSuite) TestConn_NoDeprecateEOF() {
105+
addr := fmt.Sprintf("%s:%s", *test_util.MysqlHost, s.port)
106+
conn, err := Connect(addr, *testUser, *testPassword, "", func(conn *Conn) error {
107+
conn.UnsetCapability(mysql.CLIENT_DEPRECATE_EOF)
108+
return nil
109+
})
110+
require.NoError(s.T(), err)
111+
112+
_, err = conn.Execute("SELECT VERSION()")
113+
require.NoError(s.T(), err)
114+
}
115+
104116
func (s *clientTestSuite) TestConn_SetCapability() {
105117
caps := []uint32{
106118
mysql.CLIENT_LONG_PASSWORD,
@@ -125,6 +137,7 @@ func (s *clientTestSuite) TestConn_SetCapability() {
125137
mysql.CLIENT_PLUGIN_AUTH,
126138
mysql.CLIENT_CONNECT_ATTRS,
127139
mysql.CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA,
140+
mysql.CLIENT_DEPRECATE_EOF,
128141
}
129142

130143
for _, capI := range caps {

0 commit comments

Comments
 (0)