Skip to content

Commit ce21aa3

Browse files
committed
Always set CLIENT_MULTI_RESULTS flag in handshake. Fixes #1445
This fixes a regression in b35721f that cleared this flag. Signed-off-by: Bradley Grainger <[email protected]>
1 parent b279b92 commit ce21aa3

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

src/MySqlConnector/Protocol/Payloads/HandshakeResponse41Payload.cs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,26 @@ private static ByteBufferWriter CreateCapabilitiesPayload(ProtocolCapabilities s
99
{
1010
var writer = new ByteBufferWriter();
1111

12-
var clientCapabilities = (ProtocolCapabilities.Protocol41 |
13-
(cs.InteractiveSession ? ProtocolCapabilities.Interactive : 0) |
14-
ProtocolCapabilities.LongPassword |
15-
ProtocolCapabilities.Transactions |
12+
var clientCapabilities =
13+
ProtocolCapabilities.Protocol41 |
14+
(cs.InteractiveSession ? (serverCapabilities & ProtocolCapabilities.Interactive) : 0) |
15+
(serverCapabilities & ProtocolCapabilities.LongPassword) |
16+
(serverCapabilities & ProtocolCapabilities.Transactions) |
1617
ProtocolCapabilities.SecureConnection |
17-
ProtocolCapabilities.PluginAuth |
18-
ProtocolCapabilities.PluginAuthLengthEncodedClientData |
18+
(serverCapabilities & ProtocolCapabilities.PluginAuth) |
19+
(serverCapabilities & ProtocolCapabilities.PluginAuthLengthEncodedClientData) |
1920
ProtocolCapabilities.MultiStatements |
2021
ProtocolCapabilities.MultiResults |
2122
(cs.AllowLoadLocalInfile ? ProtocolCapabilities.LocalFiles : 0) |
22-
(string.IsNullOrWhiteSpace(cs.Database)
23-
? 0
24-
: ProtocolCapabilities.ConnectWithDatabase) |
23+
(string.IsNullOrWhiteSpace(cs.Database) ? 0 : ProtocolCapabilities.ConnectWithDatabase) |
2524
(cs.UseAffectedRows ? 0 : ProtocolCapabilities.FoundRows) |
2625
(useCompression ? ProtocolCapabilities.Compress : ProtocolCapabilities.None) |
27-
ProtocolCapabilities.ConnectionAttributes |
28-
ProtocolCapabilities.SessionTrack |
29-
ProtocolCapabilities.DeprecateEof |
30-
ProtocolCapabilities.QueryAttributes |
31-
ProtocolCapabilities.MariaDbCacheMetadata |
32-
additionalCapabilities) & serverCapabilities;
26+
(serverCapabilities & ProtocolCapabilities.ConnectionAttributes) |
27+
(serverCapabilities & ProtocolCapabilities.SessionTrack) |
28+
(serverCapabilities & ProtocolCapabilities.DeprecateEof) |
29+
(serverCapabilities & ProtocolCapabilities.QueryAttributes) |
30+
(serverCapabilities & ProtocolCapabilities.MariaDbCacheMetadata) |
31+
additionalCapabilities;
3332

3433
writer.Write((int) clientCapabilities);
3534
writer.Write(0x4000_0000);

0 commit comments

Comments
 (0)