summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-01-09 17:00:04 +0100
committerSergei Golubchik <serg@mariadb.org>2021-01-11 21:54:47 +0100
commitfc0d9a470ce9ae2285f687e9b13f08b76527051b (patch)
treeb960403bb545306a9c812b120c7ba8ec57366ea8 /mysql-test
parent69f1adaa5565bdd752215774cc7e455793c25109 (diff)
downloadmariadb-git-fc0d9a470ce9ae2285f687e9b13f08b76527051b.tar.gz
MDEV-22966 Server crashes or hangs with SET ROLE when started with skip-grant-tables
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/skip_grants.result8
-rw-r--r--mysql-test/t/skip_grants.test11
2 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/skip_grants.result b/mysql-test/r/skip_grants.result
index b92e62a6ff0..b058c8f001e 100644
--- a/mysql-test/r/skip_grants.result
+++ b/mysql-test/r/skip_grants.result
@@ -99,3 +99,11 @@ Acl_users 0
#
# End of 10.1 tests
#
+#
+# MDEV-22966 Server crashes or hangs with SET ROLE when started with skip-grant-tables
+#
+set role x;
+ERROR HY000: The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/t/skip_grants.test b/mysql-test/t/skip_grants.test
index f68734f8244..0ecaa022fd4 100644
--- a/mysql-test/t/skip_grants.test
+++ b/mysql-test/t/skip_grants.test
@@ -128,3 +128,14 @@ show global status like 'Acl%';
--echo #
--echo # End of 10.1 tests
--echo #
+
+--echo #
+--echo # MDEV-22966 Server crashes or hangs with SET ROLE when started with skip-grant-tables
+--echo #
+
+--error ER_OPTION_PREVENTS_STATEMENT
+set role x;
+
+--echo #
+--echo # End of 10.2 tests
+--echo #