mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge branch '11.0' into 11.1
This commit is contained in:
@ -288,7 +288,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,
|
||||
@ -850,3 +849,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 '';
|
||||
|
Reference in New Issue
Block a user