diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-25 12:19:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-25 12:19:11 +0200 |
| commit | 4473d174308eeb14757fc986da39b8f4d391ce03 (patch) | |
| tree | b6f51bae3b958b2d18ca33b146ff5f1c74b2f9b8 | |
| parent | 48b5f8a5444af05c460b6142b0574b789a4e7882 (diff) | |
| parent | 0a95c922c8a2c1625ec6756b1e5c523e1cc4f73d (diff) | |
| download | mariadb-git-4473d174308eeb14757fc986da39b8f4d391ce03.tar.gz | |
Merge 10.2 into 10.3
| -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 686038521f8..9ce41999b6f 100644 --- a/mysql-test/main/innodb_ext_key.result +++ b/mysql-test/main/innodb_ext_key.result @@ -804,5 +804,5 @@ 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; diff --git a/mysql-test/main/innodb_ext_key.test b/mysql-test/main/innodb_ext_key.test index de9ca10ff1b..04ebcc1e41b 100644 --- a/mysql-test/main/innodb_ext_key.test +++ b/mysql-test/main/innodb_ext_key.test @@ -622,6 +622,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; |