1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä 2021-02-25 12:31:26 +02:00
commit a6c6c4f463
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/innodb_ext_key.result
View File

@ -809,7 +809,7 @@ PRIMARY KEY(pk)
INSERT INTO t2 SELECT a,a FROM t1; INSERT INTO t2 SELECT a,a FROM t1;
EXPLAIN SELECT pk FROM t2 FORCE INDEX(k1); EXPLAIN SELECT pk FROM t2 FORCE INDEX(k1);
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 index NULL k1 23 NULL 10 Using index 1 SIMPLE t2 index NULL k1 23 NULL # Using index
DROP TABLE t1,t2; DROP TABLE t1,t2;
set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent= @innodb_stats_persistent_save;
set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save;

1
mysql-test/main/innodb_ext_key.test
View File

@ -636,6 +636,7 @@ CREATE TABLE t2 (
)ENGINE=INNODB; )ENGINE=INNODB;
INSERT INTO t2 SELECT a,a FROM t1; INSERT INTO t2 SELECT a,a FROM t1;
--replace_column 9 #
EXPLAIN SELECT pk FROM t2 FORCE INDEX(k1); EXPLAIN SELECT pk FROM t2 FORCE INDEX(k1);
DROP TABLE t1,t2; DROP TABLE t1,t2;