Merge branch 'develop' into MXS-329-develop-20151111

2015-11-13 07:44:23 +02:00
parent 30d1fc66b7 1433d28f5f
commit 6b88b6b17f
66 changed files with 4807 additions and 4056 deletions
--- a/server/modules/routing/maxinfo/maxinfo.c
+++ b/server/modules/routing/maxinfo/maxinfo.c
@ -780,7 +780,7 @@ maxinfo_add_mysql_user(SERVICE *service) {
 			"maxinfo: create hex_sha1_sha1_password failed for service user %s",
 			service_user)));
 		users_free(service->users);
-
+        service->users = NULL;
 		return 1;
 	}