Merge branch '2.1' into 2.2

2017-12-12 13:23:02 +02:00
parent 6485365b3b 7ebd487ef3
commit 79afaa447e
97 changed files with 5945 additions and 361 deletions
--- a/server/core/service.cc
+++ b/server/core/service.cc
@ -1607,6 +1607,7 @@ service_update(SERVICE *service, char *router, char *user, char *auth)
 */
 int service_refresh_users(SERVICE *service)
 {
+    ss_dassert(service);
    int ret = 1;
    int self = mxs_worker_get_current_id();
    ss_dassert(self >= 0);