From cd83aa40dbda56b6d23081cb7e354ffa7d3ae35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Fri, 29 Sep 2017 10:03:43 +0300
Subject: [PATCH] Stop monitors first when shutting down

As monitors aren't synchronized with the worker threads, they need to be
shut down first.
---
 server/core/gateway.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index 9c75a224e..b6094b339 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -2076,6 +2076,9 @@ int main(int argc, char **argv)
     ss_dassert(worker);
     worker->run();
 
+    /*< Stop all the monitors */
+    monitorStopAll();
+
     /** Stop administrative interface */
     mxs_admin_shutdown();