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

Merge remote-tracking branch 10.4 into 10.5

Browse Source
This commit is contained in:
Daniel Black
2021-02-26 13:25:04 +11:00
parent 86d60fc9e7 a6c6c4f463
commit 1696e4df3f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -813,7 +813,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

@ -640,6 +640,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;