Merge branch '2.3' into develop

2019-06-19 13:28:58 +03:00
parent 52b7c23998 3d8475f8ed
commit aeebf941f6
7 changed files with 84 additions and 42 deletions
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -2248,9 +2248,6 @@ int main(int argc, char** argv)

    main_worker->run();

-    /** Stop administrative interface */
-    mxs_admin_shutdown();
-
    /*< Stop all monitors */
    MonitorManager::stop_all_monitors();