database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

MDEV-17804: Galera tests cause mysql_socket.h:738: inline_mysql_socket_send: Assertion `mysql_socket.fd != -1' failed.

Browse Source 
Do not do end of statement logic if thd is already killed as
socket is already closed.
This commit is contained in:
Jan Lindström
2018-11-22 16:33:20 +02:00
parent dde0a83fff
commit 3728b11f87
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@@ -2359,7 +2359,8 @@ com_multi_end:
/* 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