From f90d9c347fdac35720f874070797559ede066598 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Tue, 4 Oct 2022 11:44:14 +0400
Subject: [PATCH] MDEV-28822 Table from older version requires table rebuild
 when adding column to table with multi-column index

This problem was earlier fixed in 10.4 by the patch for MDEV-29481.

Adding MTR tests only.
---
 .../mysql_upgrade/mdev28822_100427_innodb.frm | Bin 0 -> 1443 bytes
 .../suite/innodb/r/instant_alter.result       |  11 +++++++++++
 mysql-test/suite/innodb/t/instant_alter.test  |  18 ++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 mysql-test/std_data/mysql_upgrade/mdev28822_100427_innodb.frm

diff --git a/mysql-test/std_data/mysql_upgrade/mdev28822_100427_innodb.frm b/mysql-test/std_data/mysql_upgrade/mdev28822_100427_innodb.frm
new file mode 100644
index 0000000000000000000000000000000000000000..d9cc5e6cc691aceeb521d65a7b81eca6f6f56e41
GIT binary patch
literal 1443
zcmeyz$i*YX5XQjBu$YyB;SsX{0~|2fF>o?407V%XI2f29!jG647`!_e84$_@4!?3?
zblxKPcH^8UAume4K8;{uU|<3&;|1zq0h-Iez}NuPE$zU<kjcOYHV7`j)W8OmZ{TA1
z9}wi}>lhUIKQrY&#HLYlGz3ONV9<sDW-eu8@XX80cX5I^*_+WDl=Vk20F{`cKr8?%
rMWG;oK@40Xg1OwFvQXLq$Y$mM3ve-jOG6-=A1DAS3UiCo|1$sp^lT#-

literal 0
HcmV?d00001

diff --git a/mysql-test/suite/innodb/r/instant_alter.result b/mysql-test/suite/innodb/r/instant_alter.result
index 6744f0fe061..4a67e04205b 100644
--- a/mysql-test/suite/innodb/r/instant_alter.result
+++ b/mysql-test/suite/innodb/r/instant_alter.result
@@ -2929,3 +2929,14 @@ t1	CREATE TABLE `t1` (
   KEY `f2` (`f2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1, t2;
+#
+# MDEV-28822 Table from older version requires table rebuild when adding column to table with multi-column index
+#
+CREATE TABLE mdev28822_100427_innodb (
+id int not null primary key,
+msg varchar(10),
+index(id, msg)
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
+FLUSH TABLES;
+ALTER TABLE mdev28822_100427_innodb ADD i1 INTEGER, ALGORITHM=INSTANT;
+DROP TABLE mdev28822_100427_innodb;
diff --git a/mysql-test/suite/innodb/t/instant_alter.test b/mysql-test/suite/innodb/t/instant_alter.test
index 22815798f69..8e333e3bb72 100644
--- a/mysql-test/suite/innodb/t/instant_alter.test
+++ b/mysql-test/suite/innodb/t/instant_alter.test
@@ -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;