Merge branch '2.3' into 2.4

server/core/queryclassifier.cc

@@ -994,6 +994,9 @@ QueryClassifier::RouteInfo QueryClassifier::update_route_info(
     uint32_t type_mask = QUERY_TYPE_UNKNOWN;
     uint32_t stmt_id = 0;
 
+    // Reset for every classification
+    m_ps_continuation = false;
+
     // TODO: It may be sufficient to simply check whether we are in a read-only
     // TODO: transaction.
     bool in_read_only_trx =

server/core/routingworker.cc

@@ -448,6 +448,8 @@ bool mxs_worker_should_shutdown(MXB_WORKER* pWorker)
 
 RoutingWorker* RoutingWorker::get(int worker_id)
 {
+    mxb_assert(this_unit.initialized);
+
     if (worker_id == MAIN)
     {
         worker_id = this_unit.id_main_worker;