mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge branch '10.10' into 10.11
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
--source include/innodb_page_size.inc
|
||||
--source include/have_sequence.inc
|
||||
|
||||
let $datadir=`select @@datadir`;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-11369: Instant ADD COLUMN for InnoDB
|
||||
--echo #
|
||||
@@ -949,3 +951,19 @@ ALTER TABLE t1 DROP COLUMN f3, ADD FOREIGN KEY fk (f1)
|
||||
ALTER TABLE t1 DROP COLUMN f5;
|
||||
SHOW CREATE TABLE t1;
|
||||
DROP TABLE t1, t2;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-28822 Table from older version requires table rebuild when adding column to table with multi-column index
|
||||
--echo #
|
||||
|
||||
CREATE TABLE mdev28822_100427_innodb (
|
||||
id int not null primary key,
|
||||
msg varchar(10),
|
||||
index(id, msg)
|
||||
) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
|
||||
FLUSH TABLES;
|
||||
remove_file $datadir/test/mdev28822_100427_innodb.frm;
|
||||
copy_file std_data/mysql_upgrade/mdev28822_100427_innodb.frm $datadir/test/mdev28822_100427_innodb.frm;
|
||||
ALTER TABLE mdev28822_100427_innodb ADD i1 INTEGER, ALGORITHM=INSTANT;
|
||||
DROP TABLE mdev28822_100427_innodb;
|
||||
|
Reference in New Issue
Block a user