Fix to MXS-212: https://mariadb.atlassian.net/browse/MXS-212

The listener DCB is now properly closed instead of just being removed from the poll set.
2015-06-21 12:51:54 +03:00
parent 79c20bfae8
commit e14b29baf9
5 changed files with 23 additions and 14 deletions
--- a/server/core/poll.c
+++ b/server/core/poll.c
@ -330,7 +330,8 @@ poll_remove_dcb(DCB *dcb)
        CHK_DCB(dcb);

        /*< It is possible that dcb has already been removed from the set */
-        if (dcb->state != DCB_STATE_POLLING) 
+        if (dcb->state != DCB_STATE_POLLING &&
+	    dcb->state != DCB_STATE_LISTENING)
 	{
                if (dcb->state == DCB_STATE_NOPOLLING ||
                    dcb->state == DCB_STATE_ZOMBIE)