Merge remote-tracking branch 10.4 into 10.5

2025-07-27 18:02:13 +03:00 · 2021-02-26 13:25:04 +11:00
parent 86d60fc9e7 a6c6c4f463
commit 1696e4df3f
2 changed files with 2 additions and 1 deletions
--- a/mysql-test/main/innodb_ext_key.test
+++ b/mysql-test/main/innodb_ext_key.test
@ -640,6 +640,7 @@ CREATE TABLE t2 (
 )ENGINE=INNODB;

 INSERT INTO t2 SELECT a,a FROM t1;
+--replace_column 9 #
 EXPLAIN SELECT pk FROM t2 FORCE INDEX(k1);

 DROP TABLE t1,t2;