summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnel Husakovic <anel@mariadb.org>2019-11-21 21:10:35 +0100
committerAnel Husakovic <anel@mariadb.org>2019-11-21 23:22:08 +0100
commitef7c479d331fd89083801dec4cbc50f96f892a4c (patch)
tree94cd963a159b57a89ca2e46cbcb811f00ab10381
parenta14544260c33dcdb057d2f62c4aab33cb09ebcb1 (diff)
downloadmariadb-git-bb-10.3-anel.tar.gz
MDEV-20382 SHOW PRIVILEGES displays "Delete versioning rows" rather than "Delete History"bb-10.3-anel
-rw-r--r--mysql-test/main/grant.result2
-rw-r--r--sql/sql_show.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/grant.result b/mysql-test/main/grant.result
index ccbabab8019..9777d797f10 100644
--- a/mysql-test/main/grant.result
+++ b/mysql-test/main/grant.result
@@ -612,7 +612,7 @@ Create temporary tables Databases To use CREATE TEMPORARY TABLE
Create view Tables To create new views
Create user Server Admin To create new users
Delete Tables To delete existing rows
-Delete versioning rows Tables To delete versioning table historical rows
+Delete history Tables To delete versioning table historical rows
Drop Databases,Tables To drop databases, tables, and views
Event Server Admin To create, alter, drop and execute events
Execute Functions,Procedures To execute stored routines
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index a853d3df6f6..c965801f712 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -592,7 +592,7 @@ static struct show_privileges_st sys_privileges[]=
{"Create view", "Tables", "To create new views"},
{"Create user", "Server Admin", "To create new users"},
{"Delete", "Tables", "To delete existing rows"},
- {"Delete versioning rows", "Tables", "To delete versioning table historical rows"},
+ {"Delete history", "Tables", "To delete versioning table historical rows"},
{"Drop", "Databases,Tables", "To drop databases, tables, and views"},
#ifdef HAVE_EVENT_SCHEDULER
{"Event","Server Admin","To create, alter, drop and execute events"},