diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-02-26 13:25:04 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-02-26 13:26:05 +1100 |
| commit | 1696e4df3f296cf2df2657eb6fe785d2cab905a7 (patch) | |
| tree | 6098e87e2e06b9640896345b7beaa6be1dd72c9f | |
| parent | 86d60fc9e7d903d06a4f5a5623b5d980f770d982 (diff) | |
| parent | a6c6c4f4633e2432a4b75ad0406df439f732cad8 (diff) | |
| download | mariadb-git-1696e4df3f296cf2df2657eb6fe785d2cab905a7.tar.gz | |
Merge remote-tracking branch 10.4 into 10.5
| -rw-r--r-- | mysql-test/main/innodb_ext_key.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/innodb_ext_key.test | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/innodb_ext_key.result b/mysql-test/main/innodb_ext_key.result index 4c502a46981..0d3e27e5bf0 100644 --- a/mysql-test/main/innodb_ext_key.result +++ b/mysql-test/main/innodb_ext_key.result @@ -813,7 +813,7 @@ PRIMARY KEY(pk) INSERT INTO t2 SELECT a,a FROM t1; EXPLAIN SELECT pk FROM t2 FORCE INDEX(k1); 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; set global innodb_stats_persistent= @innodb_stats_persistent_save; set global innodb_stats_persistent_sample_pages= @innodb_stats_persistent_sample_pages_save; diff --git a/mysql-test/main/innodb_ext_key.test b/mysql-test/main/innodb_ext_key.test index 70d0009af27..77eda0df6f6 100644 --- 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; |