summaryrefslogtreecommitdiff
path: root/mysql-test/r/index_intersect_innodb.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-09-19 19:05:35 +0200
committerSergei Golubchik <serg@mariadb.org>2016-09-21 10:03:16 +0200
commit398d33ce9d937386e2762a91d10bbc12217878db (patch)
tree384753a3587d03071d4f1f65f2ac6a094a9e4508 /mysql-test/r/index_intersect_innodb.result
parent10aa3936a794184229229ae43eee51ae3b3f5681 (diff)
downloadmariadb-git-398d33ce9d937386e2762a91d10bbc12217878db.tar.gz
fix main.index_intersect_innodb failure on trusty-amd64
Diffstat (limited to 'mysql-test/r/index_intersect_innodb.result')
-rw-r--r--mysql-test/r/index_intersect_innodb.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/index_intersect_innodb.result b/mysql-test/r/index_intersect_innodb.result
index 9c3a501111d..15244098170 100644
--- a/mysql-test/r/index_intersect_innodb.result
+++ b/mysql-test/r/index_intersect_innodb.result
@@ -485,7 +485,7 @@ SELECT * FROM City
WHERE ID BETWEEN 3001 AND 4000 AND Population > 600000
AND Country BETWEEN 'S' AND 'Z' ;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE City index_merge PRIMARY,Population,Country PRIMARY,Country,Population 4,7,4 NULL # Using sort_intersect(PRIMARY,Country,Population); Using where
+1 SIMPLE City index_merge PRIMARY,Population,Country PRIMARY,Population,Country 4,4,7 NULL # Using sort_intersect(PRIMARY,Population,Country); Using where
SELECT * FROM City USE INDEX ()
WHERE ID BETWEEN 501 AND 1000 AND Population > 700000 AND Country LIKE 'C%';
ID Name Country Population
@@ -745,7 +745,7 @@ SELECT * FROM City
WHERE ID BETWEEN 3001 AND 4000 AND Population > 600000
AND Country BETWEEN 'S' AND 'Z';
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE City index_merge PRIMARY,Population,Country PRIMARY,Country,Population 4,7,4 NULL # Using sort_intersect(PRIMARY,Country,Population); Using where
+1 SIMPLE City index_merge PRIMARY,Population,Country PRIMARY,Population,Country 4,4,7 NULL # Using sort_intersect(PRIMARY,Population,Country); Using where
SELECT * FROM City WHERE
Name LIKE 'C%' AND Population > 1000000;
ID Name Country Population