Skip to content

Commit

Permalink
Always set CLIENT_MULTI_RESULTS flag in handshake. Fixes #1445
Browse files Browse the repository at this point in the history
This fixes a regression in b35721f that cleared this flag.

Signed-off-by: Bradley Grainger <bgrainger@gmail.com>
  • Loading branch information
bgrainger committed Jan 29, 2024
1 parent b279b92 commit ce21aa3
Showing 1 changed file with 14 additions and 15 deletions.
29 changes: 14 additions & 15 deletions src/MySqlConnector/Protocol/Payloads/HandshakeResponse41Payload.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,26 @@ private static ByteBufferWriter CreateCapabilitiesPayload(ProtocolCapabilities s
{
var writer = new ByteBufferWriter();

var clientCapabilities = (ProtocolCapabilities.Protocol41 |
(cs.InteractiveSession ? ProtocolCapabilities.Interactive : 0) |
ProtocolCapabilities.LongPassword |
ProtocolCapabilities.Transactions |
var clientCapabilities =
ProtocolCapabilities.Protocol41 |
(cs.InteractiveSession ? (serverCapabilities & ProtocolCapabilities.Interactive) : 0) |
(serverCapabilities & ProtocolCapabilities.LongPassword) |
(serverCapabilities & ProtocolCapabilities.Transactions) |
ProtocolCapabilities.SecureConnection |
ProtocolCapabilities.PluginAuth |
ProtocolCapabilities.PluginAuthLengthEncodedClientData |
(serverCapabilities & ProtocolCapabilities.PluginAuth) |
(serverCapabilities & ProtocolCapabilities.PluginAuthLengthEncodedClientData) |
ProtocolCapabilities.MultiStatements |
ProtocolCapabilities.MultiResults |
(cs.AllowLoadLocalInfile ? ProtocolCapabilities.LocalFiles : 0) |
(string.IsNullOrWhiteSpace(cs.Database)
? 0
: ProtocolCapabilities.ConnectWithDatabase) |
(string.IsNullOrWhiteSpace(cs.Database) ? 0 : ProtocolCapabilities.ConnectWithDatabase) |
(cs.UseAffectedRows ? 0 : ProtocolCapabilities.FoundRows) |
(useCompression ? ProtocolCapabilities.Compress : ProtocolCapabilities.None) |
ProtocolCapabilities.ConnectionAttributes |
ProtocolCapabilities.SessionTrack |
ProtocolCapabilities.DeprecateEof |
ProtocolCapabilities.QueryAttributes |
ProtocolCapabilities.MariaDbCacheMetadata |
additionalCapabilities) & serverCapabilities;
(serverCapabilities & ProtocolCapabilities.ConnectionAttributes) |
(serverCapabilities & ProtocolCapabilities.SessionTrack) |
(serverCapabilities & ProtocolCapabilities.DeprecateEof) |
(serverCapabilities & ProtocolCapabilities.QueryAttributes) |
(serverCapabilities & ProtocolCapabilities.MariaDbCacheMetadata) |
additionalCapabilities;

writer.Write((int) clientCapabilities);
writer.Write(0x4000_0000);
Expand Down

0 comments on commit ce21aa3

Please sign in to comment.