summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2016-09-24 20:20:33 +0300
committerSergei Petrunia <psergey@askmonty.org>2016-09-24 20:20:33 +0300
commitc1b2828fe07aa89c42faeabaa9773fac420e363b (patch)
treeadd0bfe052f9737b3b9fc1c83d6329e2b544e9bb
parentde2175e96aa71eee1c5598d5e345b6e52c1a3a1d (diff)
downloadmariadb-git-c1b2828fe07aa89c42faeabaa9773fac420e363b.tar.gz
MDEV-10174: Make the fix for MDEV-8989 enabled by default in 10.2
(Continued after a95e38) Update more test results.
-rw-r--r--mysql-test/r/named_pipe.result2
-rw-r--r--mysql-test/r/shm.result2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/named_pipe.result b/mysql-test/r/named_pipe.result
index 70806a8aff8..85cc6235e75 100644
--- a/mysql-test/r/named_pipe.result
+++ b/mysql-test/r/named_pipe.result
@@ -602,7 +602,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t3 eq_ref PRIMARY PRIMARY 4 test.t2.fld1 1 Using where; Using index
explain select * from t3 as t1,t3 where t1.period=t3.period order by t3.period;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ALL period NULL NULL NULL 41810 Using temporary; Using filesort
+1 SIMPLE t1 ALL period NULL NULL NULL 41810 Using filesort
1 SIMPLE t3 ref period period 4 test.t1.period 4181
explain select * from t3 as t1,t3 where t1.period=t3.period order by t3.period limit 10;
id select_type table type possible_keys key key_len ref rows Extra
diff --git a/mysql-test/r/shm.result b/mysql-test/r/shm.result
index 13f715b4e26..cd3e6a559b8 100644
--- a/mysql-test/r/shm.result
+++ b/mysql-test/r/shm.result
@@ -602,7 +602,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t3 eq_ref PRIMARY PRIMARY 4 test.t2.fld1 1 Using where; Using index
explain select * from t3 as t1,t3 where t1.period=t3.period order by t3.period;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 ALL period NULL NULL NULL 41810 Using temporary; Using filesort
+1 SIMPLE t1 ALL period NULL NULL NULL 41810 Using filesort
1 SIMPLE t3 ref period period 4 test.t1.period 4181
explain select * from t3 as t1,t3 where t1.period=t3.period order by t3.period limit 10;
id select_type table type possible_keys key key_len ref rows Extra