diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-29 15:41:05 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-29 15:41:05 +0100 |
| commit | 41a163ac5ccf4ac5394edc84e40b3f47acea6b08 (patch) | |
| tree | 60d5259e290b4a0166d8ef1651975b14b5afe304 /sql/protocol.cc | |
| parent | a85d942be9008cf19086d8bd330c4be83a18167f (diff) | |
| parent | e2b50213cf12623da31c8b49be4d40772876223c (diff) | |
| download | mariadb-git-41a163ac5ccf4ac5394edc84e40b3f47acea6b08.tar.gz | |
Merge branch '10.2' into 10.3mariadb-10.3.33
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index a4a70e71fa3..405b50f4971 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -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); |