Merge branch 'develop' into MAX-324

2015-02-16 14:58:35 +02:00
parent 14c510abef f54b57d987
commit a2bff1dcea
38 changed files with 32195 additions and 1388 deletions
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@ -385,7 +385,7 @@ getDatabases(SERVICE *service, MYSQL *con)
 				"%s: Unable to load database grant information, MaxScale "
 				"authentication will proceed without including database "
 				"permissions. To correct this GRANT select permission "
-				"on msql.db to the user %s.",
+				"on mysql.db to the user %s.",
 					service->name, service_user)));
 	}