diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-07-13 14:47:58 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-07-13 14:49:05 +0300 |
| commit | 12ac3ee11e8bc433432a2b3ba1bb79ea2e2d9965 (patch) | |
| tree | a28d1c7045c6e19f5fee3317d4d7cf391c54ea44 | |
| parent | bebabd68abc2c52dfb7cdc05bef2bc18e80b1be5 (diff) | |
| download | mariadb-git-12ac3ee11e8bc433432a2b3ba1bb79ea2e2d9965.tar.gz | |
Update test results: make innodb_ext_key test stable
| -rw-r--r-- | mysql-test/r/innodb_ext_key.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/innodb_ext_key.test | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/innodb_ext_key.result b/mysql-test/r/innodb_ext_key.result index c0b91c88d8a..f800676c863 100644 --- a/mysql-test/r/innodb_ext_key.result +++ b/mysql-test/r/innodb_ext_key.result @@ -1059,10 +1059,6 @@ concat('1234567890-', 1000+ A.a + 10*B.a + 100*C.a), repeat('filler-data-', 4) from t0 A, t0 B, t0 C; -# The following must use type=ALL (and NOT type=ref, rows=1) -explain select * from t1 where col1='1234567890-a'; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL idx1 NULL NULL NULL # Using where drop table t0,t1; # # MDEV-10360: Extended keys: index properties depend on index order diff --git a/mysql-test/t/innodb_ext_key.test b/mysql-test/t/innodb_ext_key.test index ebea442d8ca..bf94b7dd3d5 100644 --- a/mysql-test/t/innodb_ext_key.test +++ b/mysql-test/t/innodb_ext_key.test @@ -715,9 +715,13 @@ select from t0 A, t0 B, t0 C; ---echo # The following must use type=ALL (and NOT type=ref, rows=1) ---replace_column 9 # -explain select * from t1 where col1='1234567890-a'; +let $q=explain select * from t1 where col1='1234567890-a'; +let $rows=query_get_value($q, rows, 1); +if ($rows < 2) +{ + --echo The EXPLAIN should not produce a query plan with type=ref, rows=1 + --die Fix for MDEV-10325 didnt work; +} drop table t0,t1; |