database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-11-29 11:39:34 +02:00
parent bf8735eb16 d4cb177603
commit 51c89849d1
29 changed files with 617 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mysql_install_db.sh
View File

@@ -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

5
scripts/mysql_system_tables_fix.sql
View File

@@ -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
#