database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-01-30 09:46:52 +01:00
parent 12cad0c346 41a163ac5c
commit a576a1cea5
440 changed files with 7883 additions and 3481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/protocol.cc
View File

@ -467,8 +467,12 @@ bool net_send_error_packet(THD *thd, uint sql_errno, const char *err,
coming from server to have seq_no > 0, due to missing awareness
of "out-of-band" operations. Make these clients happy.
*/
if (!net->pkt_nr)
net->pkt_nr= 1;
if (!net->pkt_nr &&
(sql_errno == ER_CONNECTION_KILLED || sql_errno == ER_SERVER_SHUTDOWN ||
sql_errno == ER_QUERY_INTERRUPTED))
{
net->pkt_nr= 1;
}
ret= net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) buff,
length);