diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-25 12:31:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-25 12:31:26 +0200 |
| commit | a6c6c4f4633e2432a4b75ad0406df439f732cad8 (patch) | |
| tree | c74e5644ca396b72cfe0c902c4639974075570c0 | |
| parent | ef96ec3b51998066790082f4028fec1c390ef36d (diff) | |
| parent | 4473d174308eeb14757fc986da39b8f4d391ce03 (diff) | |
| download | mariadb-git-a6c6c4f4633e2432a4b75ad0406df439f732cad8.tar.gz | |
Merge 10.3 into 10.4
| -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 1dab686feb8..6fba116d35d 100644 --- a/mysql-test/main/innodb_ext_key.result +++ b/mysql-test/main/innodb_ext_key.result @@ -809,7 +809,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 4e04f032864..1ff0ea51990 100644 --- a/mysql-test/main/innodb_ext_key.test +++ b/mysql-test/main/innodb_ext_key.test @@ -636,6 +636,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; |