Merge branch '2.2' into 2.3

2019-06-19 10:54:37 +03:00
parent 35b5f2099b 27fb397041
commit 3d8475f8ed
5 changed files with 33 additions and 18 deletions
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -2255,9 +2255,6 @@ int main(int argc, char** argv)
    mxb_assert(worker);
    worker->run();

-    /** Stop administrative interface */
-    mxs_admin_shutdown();
-
    /*< Stop all monitors */
    monitor_stop_all();