1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge branch '11.5' into 11.6

This commit is contained in:
Oleksandr Byelkin
2024-08-21 13:28:32 +02:00
107 changed files with 2996 additions and 316 deletions

View File

@ -557,8 +557,19 @@ DROP TABLE t1;
--echo # End of 10.4 tests
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
--echo #
--echo # MDEV-29010 Table cannot be loaded after instant ALTER
--echo #
CREATE TABLE t1 (a CHAR(255), b INT,
c INT as (b) VIRTUAL)ENGINE=InnoDB CHARACTER SET utf32;
ALTER TABLE t1 DROP COLUMN a;
ALTER TABLE t1 DROP COLUMN c;
DROP TABLE t1;
--echo # End of 10.5 tests
--echo # End of 10.6 tests
--source include/test_db_charset_restore.inc
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;