From bf5c2512397b6bb44752528bff4315b06834cd7a Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 19 Sep 2023 13:39:27 +1000 Subject: [PATCH] MDEV-27757 Database upgrade fails from 5.1: slow_log table The table structure from MySQL-5.1.14 is: CREATE TABLE `slow_log` ( `start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `user_host` mediumtext NOT NULL, `query_time` time NOT NULL, `lock_time` time NOT NULL, `rows_sent` int(11) NOT NULL, `rows_examined` int(11) NOT NULL, `db` varchar(512) DEFAULT NULL, `last_insert_id` int(11) DEFAULT NULL, `insert_id` int(11) DEFAULT NULL, `server_id` int(11) DEFAULT NULL, `sql_text` mediumtext NOT NULL ) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log' Even as far back as MySQL-5.5.40 this table could be created as NULLs where not permitted in the CSV table time, but it seems they where allowed sometime. As the first part of mariadb-upgrade adds the column thread_id without correcting the 'NULL'able status of existing columns it fails. We reorder the sql statements in the ugprade as follows: ALTER TABLE slow_log MODIFY {columns} {new types} NOT NULL,.... As thread_id doesn't exist in the above statement it was removed from the first ALTER TABLE statement to prevent failure. Previous ALTER TABLE slow_log where moved later appending thread_id and rows_affected, and also enforces the type of thread_id if it was incorrectly like the now first ALTER STATEMENT slow_log used to do. --- scripts/mysql_system_tables_fix.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index c009a3de4a0..81d8d183e4b 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -247,10 +247,6 @@ SET GLOBAL general_log = @old_log_state; SET @old_log_state = @@global.slow_query_log; SET GLOBAL slow_query_log = 'OFF'; -ALTER TABLE slow_log - ADD COLUMN thread_id BIGINT(21) UNSIGNED NOT NULL AFTER sql_text; -ALTER TABLE slow_log - ADD COLUMN rows_affected INTEGER NOT NULL AFTER thread_id; ALTER TABLE slow_log MODIFY start_time TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, MODIFY user_host MEDIUMTEXT NOT NULL, @@ -262,8 +258,12 @@ ALTER TABLE slow_log MODIFY last_insert_id INTEGER NOT NULL, MODIFY insert_id INTEGER NOT NULL, MODIFY server_id INTEGER UNSIGNED NOT NULL, - MODIFY sql_text MEDIUMTEXT NOT NULL, - MODIFY thread_id BIGINT(21) UNSIGNED NOT NULL; + MODIFY sql_text MEDIUMTEXT NOT NULL; +ALTER TABLE slow_log + ADD COLUMN thread_id BIGINT(21) UNSIGNED NOT NULL AFTER sql_text; +ALTER TABLE slow_log + MODIFY thread_id BIGINT(21) UNSIGNED NOT NULL, + ADD COLUMN rows_affected INTEGER NOT NULL AFTER thread_id; SET GLOBAL slow_query_log = @old_log_state; ALTER TABLE plugin