diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-11-22 16:33:20 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-11-26 08:12:30 +0200 |
| commit | 1037edcb1140aa0bdf1d52f118d9008084f842b5 (patch) | |
| tree | de8609a7635daedc8f720b254f942aaf83d3b46c /sql/sql_parse.cc | |
| parent | 244cc35e7b929376e445adad8996de154ebc9c8f (diff) | |
| download | mariadb-git-1037edcb1140aa0bdf1d52f118d9008084f842b5.tar.gz | |
MDEV-17804: Galera tests cause mysql_socket.h:738: inline_mysql_socket_send: Assertion `mysql_socket.fd != -1' failed.
Do not do end of statement logic if thd is already killed as
socket is already closed.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a76d9f0bbd3..a73c3c22ba8 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1940,7 +1940,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, /* wsrep BF abort in query exec phase */ mysql_mutex_lock(&thd->LOCK_thd_data); do_end_of_statement= thd->wsrep_conflict_state != REPLAYING && - thd->wsrep_conflict_state != RETRY_AUTOCOMMIT; + thd->wsrep_conflict_state != RETRY_AUTOCOMMIT && + !thd->killed; mysql_mutex_unlock(&thd->LOCK_thd_data); } else |