Merge branch '2.2' into develop

2018-06-13 00:25:56 +03:00
parent 780620e796 e99d9826ad
commit 8094c67ac2
12 changed files with 154 additions and 78 deletions
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@ -2915,10 +2915,15 @@ public:
             dcb && atomic_load_int32(&m_more);
             dcb = dcb->thread.next)
        {
-            if (!m_func(dcb, m_data))
+            ss_dassert(dcb->session);
+
+            if (dcb->session->state != SESSION_STATE_DUMMY)
            {
-                atomic_store_int32(&m_more, 0);
-                break;
+                if (!m_func(dcb, m_data))
+                {
+                    atomic_store_int32(&m_more, 0);
+                    break;
+                }
            }
        }
    }