diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:39:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-29 11:39:34 +0200 |
| commit | 51c89849d16f3f6cfadfa645c49815db3cbfece7 (patch) | |
| tree | 8679103f7897480cc9b5ff3308687cce1f32dade /scripts | |
| parent | bf8735eb16068c0d2480948b365f7e39dc011be5 (diff) | |
| parent | d4cb1776030b643895da0532b75c051f55e84356 (diff) | |
| download | mariadb-git-51c89849d16f3f6cfadfa645c49815db3cbfece7.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 6 | ||||
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 79ac37695a2..f32002f996e 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -632,8 +632,7 @@ then fi echo - echo "See the MariaDB Knowledgebase at https://mariadb.com/kb or the" - echo "MySQL manual for more instructions." + echo "See the MariaDB Knowledgebase at https://mariadb.com/kb" if test "$in_rpm" -eq 0 then @@ -649,8 +648,7 @@ then echo "Please report any problems at https://mariadb.org/jira" echo echo "The latest information about MariaDB is available at https://mariadb.org/." - echo "You can find additional information about the MySQL part at:" - echo "https://dev.mysql.com" + echo echo "Consider joining MariaDB's strong and vibrant community:" echo "https://mariadb.org/get-involved/" echo 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 # |