From 7bc7f2561b2039b702ed1ffdcd42b703bb743648 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Thu, 21 Apr 2016 17:24:30 +0300 Subject: [PATCH] MXS-681: MySQL 5.7 user retrieval fails The authentication query was truncated which caused errors on MySQL 5.7 when the root user was not used in the usercount query. --- server/core/dbusers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/core/dbusers.c b/server/core/dbusers.c index e693fc7ad..e6d3698d6 100644 --- a/server/core/dbusers.c +++ b/server/core/dbusers.c @@ -99,7 +99,7 @@ /** The maximum possible length of the query */ #define MAX_QUERY_STR_LEN strlen(MYSQL_USERS_COUNT_TEMPLATE_START \ MYSQL_USERS_COUNT_TEMPLATE_END MYSQL_USERS_DB_QUERY_TEMPLATE \ - MYSQL_USERS_ORDER_BY) + strlen(MYSQL57_PASSWORD) * 2 + 1 + MYSQL_USERS_ORDER_BY USERS_QUERY_NO_ROOT) + strlen(MYSQL57_PASSWORD) * 2 + 1 #define LOAD_MYSQL_DATABASE_NAMES "SELECT * \ FROM ( (SELECT COUNT(1) AS ndbs \