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 remote-tracking branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-03-31 21:32:41 +02:00
parent e093e5abbe eaebe8b560
commit ac5a534a4c
306 changed files with 10920 additions and 6615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mysql_system_tables_fix.sql
View File

@@ -239,7 +239,6 @@ SET GLOBAL general_log = 'OFF';
ALTER TABLE general_log
MODIFY event_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
MODIFY user_host MEDIUMTEXT NOT NULL,
MODIFY thread_id INTEGER NOT NULL,
MODIFY server_id INTEGER UNSIGNED NOT NULL,
MODIFY command_type VARCHAR(64) NOT NULL,
MODIFY argument MEDIUMTEXT NOT NULL,
@@ -841,3 +840,8 @@ IF 1 = (SELECT count(*) FROM information_schema.VIEWS WHERE TABLE_CATALOG = 'def
END IF//
DELIMITER ;
# MDEV-22683 - upgrade Host and Owner of servers
ALTER TABLE servers
MODIFY Host varchar(2048) NOT NULL DEFAULT '',
MODIFY Owner varchar(512) NOT NULL DEFAULT '';