summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <cvicentiu@gmail.com>2022-06-10 21:16:40 +0300
committerVicențiu Ciorbaru <cvicentiu@gmail.com>2022-06-12 17:26:28 +0300
commit20f9d7fa9260d9322e0bdda5141947b26e1fbeb4 (patch)
treeef2d990689dd601332a6551ec3b037dff848467e
parentbee9b0cd27afe49236b23fc8942b8075d8d60701 (diff)
downloadmariadb-git-20f9d7fa9260d9322e0bdda5141947b26e1fbeb4.tar.gz
Fix show_generic VERSION
-rw-r--r--mysql-test/suite/deny/show_generic.result2
-rw-r--r--mysql-test/suite/deny/show_generic.test2
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/suite/deny/show_generic.result b/mysql-test/suite/deny/show_generic.result
index d3d481d6006..48e26499425 100644
--- a/mysql-test/suite/deny/show_generic.result
+++ b/mysql-test/suite/deny/show_generic.result
@@ -104,7 +104,7 @@ deny insert on some_db.t2 to foo;
select user, host, JSON_EXTRACT(priv, '$.deny') from mysql.global_priv
where user = 'foo';
user host JSON_EXTRACT(priv, '$.deny')
-foo % {"table": [{"name": "`some_db`.`t1`", "access": 1}, {"name": "`some_db`.`t2`", "access": 2}], "version_id": 100900}
+foo % {"table": [{"name": "`some_db`.`t1`", "access": 1}, {"name": "`some_db`.`t2`", "access": 2}], "version_id": VERSION_ID}
connect con1,localhost,foo,,;
show tables from some_db;
Tables_in_some_db
diff --git a/mysql-test/suite/deny/show_generic.test b/mysql-test/suite/deny/show_generic.test
index 20d7d8c9090..7e9eaa772a6 100644
--- a/mysql-test/suite/deny/show_generic.test
+++ b/mysql-test/suite/deny/show_generic.test
@@ -1,5 +1,7 @@
--source include/not_embedded.inc
+let $REGEX_VERSION_ID=/$mysql_get_server_version/VERSION_ID/;
+
--echo #
--echo # This test checks that denies take part in SHOW commands properly.
--echo #