summaryrefslogtreecommitdiff
path: root/scripts/mysql_system_tables_fix.sql
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-11-29 11:39:34 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-11-29 11:39:34 +0200
commit51c89849d16f3f6cfadfa645c49815db3cbfece7 (patch)
tree8679103f7897480cc9b5ff3308687cce1f32dade /scripts/mysql_system_tables_fix.sql
parentbf8735eb16068c0d2480948b365f7e39dc011be5 (diff)
parentd4cb1776030b643895da0532b75c051f55e84356 (diff)
downloadmariadb-git-51c89849d16f3f6cfadfa645c49815db3cbfece7.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'scripts/mysql_system_tables_fix.sql')
-rw-r--r--scripts/mysql_system_tables_fix.sql5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index e4f0262e368..038d5384dda 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -541,6 +541,11 @@ ALTER TABLE proc MODIFY comment
ALTER TABLE proc ADD aggregate enum('NONE', 'GROUP') DEFAULT 'NONE' NOT NULL
AFTER body_utf8;
+# Update definer of Add/DropGeometryColumn procedures to 'mariadb.sys'
+# To consider the scenarios in MDEV-23102, only update the definer when it's 'root'
+UPDATE proc SET Definer = 'mariadb.sys@localhost' WHERE Definer = 'root@localhost' AND Name = 'AddGeometryColumn';
+UPDATE proc SET Definer = 'mariadb.sys@localhost' WHERE Definer = 'root@localhost' AND Name = 'DropGeometryColumn';
+
#
# EVENT privilege
#