From fc0d9a470ce9ae2285f687e9b13f08b76527051b Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sat, 9 Jan 2021 17:00:04 +0100
Subject: MDEV-22966 Server crashes or hangs with SET ROLE when started with
 skip-grant-tables

---
 sql/sql_acl.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'sql/sql_acl.cc')

diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 6aa53e50bae..f1034986f22 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -2770,6 +2770,12 @@ end:
 
 int acl_check_setrole(THD *thd, char *rolename, ulonglong *access)
 {
+  if (!initialized)
+  {
+    my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--skip-grant-tables");
+    return 1;
+  }
+
   return check_user_can_set_role(thd, thd->security_ctx->priv_user,
            thd->security_ctx->host, thd->security_ctx->ip, rolename, access);
 }
-- 
cgit v1.2.1