Merge branch '2.2' into 2.3

2019-01-03 09:21:47 +02:00
parent 35d31801bb 8f0e4a3034
commit 26da72a41f
14 changed files with 235 additions and 148 deletions
--- a/server/modules/authenticator/MySQLAuth/dbusers.cc
+++ b/server/modules/authenticator/MySQLAuth/dbusers.cc
@ -162,7 +162,8 @@ static char* get_users_query(const char* server_version, int version, bool inclu
 {
    if (is_mariadb)     // 10.1.1 or newer, supports default roles
    {
-        return version >= 100202 ?
+        // Require 10.2.15 due to MDEV-15840 and MDEV-15556
+        return version >= 100215 ?
               get_mariadb_102_users_query(include_root) :
               get_mariadb_users_query(include_root);
    }