Merge branch '2.3' into develop

2019-01-07 10:52:07 +02:00
parent cf9ac9004e 0859f3caff
commit f0f9c21d1c
67 changed files with 777 additions and 469 deletions
--- a/server/modules/authenticator/MySQLAuth/dbusers.cc
+++ b/server/modules/authenticator/MySQLAuth/dbusers.cc
@ -214,7 +214,8 @@ static char* get_users_query(const SERVER::Version& version, bool include_root,
    switch (category)
    {
    case SERVER_ROLES:
-        rval = version.total >= 100202 ? get_mariadb_102_users_query(include_root) :
+        // Require 10.2.15 due to MDEV-15840 and MDEV-15556
+        rval = version.total >= 100215 ? get_mariadb_102_users_query(include_root) :
            get_mariadb_101_users_query(include_root);
        break;