thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-02 04:22:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix packet response capability to client

Browse Source
This commit is contained in:
BohuTANG 2020-04-23 18:58:11 +08:00 committed by zhang2014
parent 44cd5534b4
commit 4a21fce889
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/MySQLClient.cpp
View File

@ -54,7 +54,6 @@ bool MySQLClient::handshake()
"Only support " + mysql_native_password + " auth plugin name, but got " + handshake.auth_plugin_name, "Only support " + mysql_native_password + " auth plugin name, but got " + handshake.auth_plugin_name,
ErrorCodes::UNKNOWN_PACKET_FROM_SERVER); ErrorCodes::UNKNOWN_PACKET_FROM_SERVER);
} }
server_capability_flags = handshake.capability_flags;
Native41 native41(password, handshake.auth_plugin_data); Native41 native41(password, handshake.auth_plugin_data);
String auth_plugin_data = native41.getAuthPluginData(); String auth_plugin_data = native41.getAuthPluginData();
@ -63,7 +62,7 @@ bool MySQLClient::handshake()
client_capability_flags, max_packet_size, charset_utf8, user, database, auth_plugin_data, mysql_native_password); client_capability_flags, max_packet_size, charset_utf8, user, database, auth_plugin_data, mysql_native_password);
packet_sender->sendPacket<HandshakeResponse>(handshake_response, true); packet_sender->sendPacket<HandshakeResponse>(handshake_response, true);
PacketResponse packet_response(server_capability_flags); PacketResponse packet_response(client_capability_flags);
packet_sender->receivePacket(packet_response); packet_sender->receivePacket(packet_response);
packet_sender->resetSequenceId(); packet_sender->resetSequenceId();
if (packet_response.getType() == PACKET_ERR) if (packet_response.getType() == PACKET_ERR)
@ -100,7 +99,7 @@ bool MySQLClient::writeCommand(char command, String query)
WriteCommand write_command(command, query); WriteCommand write_command(command, query);
packet_sender->sendPacket<WriteCommand>(write_command, true); packet_sender->sendPacket<WriteCommand>(write_command, true);
PacketResponse packet_response(server_capability_flags); PacketResponse packet_response(client_capability_flags);
packet_sender->receivePacket(packet_response); packet_sender->receivePacket(packet_response);
switch (packet_response.getType()) switch (packet_response.getType())
{ {

1
src/Core/MySQLClient.h
View File

@ -37,7 +37,6 @@ private:
bool connected = false; bool connected = false;
String last_error; String last_error;
UInt32 client_capability_flags = 0; UInt32 client_capability_flags = 0;
UInt32 server_capability_flags = 0;
uint8_t seq = 0; uint8_t seq = 0;
UInt8 charset_utf8 = 33; UInt8 charset_utf8 = 33;