summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mysql-test/r/select.result60
-rw-r--r--mysql-test/r/select_jcl6.result48
-rw-r--r--mysql-test/r/select_pkeycache.result60
-rw-r--r--mysql-test/t/select.test3
4 files changed, 87 insertions, 84 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 23e4fa75ffb..0de259574f6 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -4916,65 +4916,65 @@ SELECT * from t1,t2,t3
WHERE t3.a3=t1.a1 AND t2.a2=t1.a1 AND
LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
a1 b1 a2 b2 a3 b3
-2 xx 2 y 2 zz
-2 xx 2 y 2 zzzz
-2 xx 2 y 2 zzz
-2 xx 2 yy 2 zz
-2 xx 2 yy 2 zzz
-1 xxx 1 yy 1 z
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 z
+1 xxx 1 y 1 z
1 xxx 1 y 1 z
1 xxx 1 y 1 zz
1 xxx 1 y 1 zz
1 xxx 1 y 1 zzz
1 xxx 1 y 1 zzz
-1 xxx 1 y 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 zz
+1 xxx 1 yy 1 zz
1 xxx 1 yyy 1 z
1 xxx 1 yyy 1 z
-SELECT * FROM t1,t2,t3
-WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND
-LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
-a1 b1 a2 b2 a3 b3
2 xx 2 y 2 zz
-2 xx 2 y 2 zzzz
2 xx 2 y 2 zzz
+2 xx 2 y 2 zzzz
2 xx 2 yy 2 zz
2 xx 2 yy 2 zzz
-1 xxx 1 yy 1 z
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 z
+SELECT * FROM t1,t2,t3
+WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND
+LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
+a1 b1 a2 b2 a3 b3
+1 xxx 1 y 1 z
1 xxx 1 y 1 z
1 xxx 1 y 1 zz
1 xxx 1 y 1 zz
1 xxx 1 y 1 zzz
1 xxx 1 y 1 zzz
-1 xxx 1 y 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 zz
+1 xxx 1 yy 1 zz
1 xxx 1 yyy 1 z
1 xxx 1 yyy 1 z
-SELECT * FROM t1,t2,t3
-WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
-LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
-a1 b1 a2 b2 a3 b3
2 xx 2 y 2 zz
-2 xx 2 y 2 zzzz
2 xx 2 y 2 zzz
+2 xx 2 y 2 zzzz
2 xx 2 yy 2 zz
2 xx 2 yy 2 zzz
-1 xxx 1 yy 1 z
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 z
+SELECT * FROM t1,t2,t3
+WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
+LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
+a1 b1 a2 b2 a3 b3
+1 xxx 1 y 1 z
1 xxx 1 y 1 z
1 xxx 1 y 1 zz
1 xxx 1 y 1 zz
1 xxx 1 y 1 zzz
1 xxx 1 y 1 zzz
-1 xxx 1 y 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 zz
+1 xxx 1 yy 1 zz
1 xxx 1 yyy 1 z
1 xxx 1 yyy 1 z
+2 xx 2 y 2 zz
+2 xx 2 y 2 zzz
+2 xx 2 y 2 zzzz
+2 xx 2 yy 2 zz
+2 xx 2 yy 2 zzz
SET SESSION optimizer_switch=DEFAULT;
DROP TABLE t1,t2,t3;
End of 5.1 tests
diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result
index 5a52b083b8e..bda9d789e18 100644
--- a/mysql-test/r/select_jcl6.result
+++ b/mysql-test/r/select_jcl6.result
@@ -4923,64 +4923,64 @@ SELECT * from t1,t2,t3
WHERE t3.a3=t1.a1 AND t2.a2=t1.a1 AND
LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
a1 b1 a2 b2 a3 b3
-1 xxx 1 yyy 1 z
1 xxx 1 y 1 z
-1 xxx 1 yy 1 z
+1 xxx 1 y 1 z
1 xxx 1 y 1 zz
-1 xxx 1 yy 1 zz
1 xxx 1 y 1 zz
-1 xxx 1 yy 1 zz
1 xxx 1 y 1 zzz
1 xxx 1 y 1 zzz
-1 xxx 1 yyy 1 z
-1 xxx 1 y 1 z
1 xxx 1 yy 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 zz
+1 xxx 1 yy 1 zz
+1 xxx 1 yyy 1 z
+1 xxx 1 yyy 1 z
2 xx 2 y 2 zz
-2 xx 2 yy 2 zz
-2 xx 2 y 2 zzzz
2 xx 2 y 2 zzz
+2 xx 2 y 2 zzzz
+2 xx 2 yy 2 zz
2 xx 2 yy 2 zzz
SELECT * FROM t1,t2,t3
WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND
LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
a1 b1 a2 b2 a3 b3
-1 xxx 1 yyy 1 z
1 xxx 1 y 1 z
-1 xxx 1 yy 1 z
+1 xxx 1 y 1 z
1 xxx 1 y 1 zz
-1 xxx 1 yy 1 zz
1 xxx 1 y 1 zz
-1 xxx 1 yy 1 zz
1 xxx 1 y 1 zzz
1 xxx 1 y 1 zzz
-1 xxx 1 yyy 1 z
-1 xxx 1 y 1 z
1 xxx 1 yy 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 zz
+1 xxx 1 yy 1 zz
+1 xxx 1 yyy 1 z
+1 xxx 1 yyy 1 z
2 xx 2 y 2 zz
-2 xx 2 yy 2 zz
-2 xx 2 y 2 zzzz
2 xx 2 y 2 zzz
+2 xx 2 y 2 zzzz
+2 xx 2 yy 2 zz
2 xx 2 yy 2 zzz
SELECT * FROM t1,t2,t3
WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
a1 b1 a2 b2 a3 b3
-1 xxx 1 yyy 1 z
1 xxx 1 y 1 z
-1 xxx 1 yy 1 z
+1 xxx 1 y 1 z
1 xxx 1 y 1 zz
-1 xxx 1 yy 1 zz
1 xxx 1 y 1 zz
-1 xxx 1 yy 1 zz
1 xxx 1 y 1 zzz
1 xxx 1 y 1 zzz
-1 xxx 1 yyy 1 z
-1 xxx 1 y 1 z
1 xxx 1 yy 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 zz
+1 xxx 1 yy 1 zz
+1 xxx 1 yyy 1 z
+1 xxx 1 yyy 1 z
2 xx 2 y 2 zz
-2 xx 2 yy 2 zz
-2 xx 2 y 2 zzzz
2 xx 2 y 2 zzz
+2 xx 2 y 2 zzzz
+2 xx 2 yy 2 zz
2 xx 2 yy 2 zzz
SET SESSION optimizer_switch=DEFAULT;
DROP TABLE t1,t2,t3;
diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result
index 23e4fa75ffb..0de259574f6 100644
--- a/mysql-test/r/select_pkeycache.result
+++ b/mysql-test/r/select_pkeycache.result
@@ -4916,65 +4916,65 @@ SELECT * from t1,t2,t3
WHERE t3.a3=t1.a1 AND t2.a2=t1.a1 AND
LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
a1 b1 a2 b2 a3 b3
-2 xx 2 y 2 zz
-2 xx 2 y 2 zzzz
-2 xx 2 y 2 zzz
-2 xx 2 yy 2 zz
-2 xx 2 yy 2 zzz
-1 xxx 1 yy 1 z
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 z
+1 xxx 1 y 1 z
1 xxx 1 y 1 z
1 xxx 1 y 1 zz
1 xxx 1 y 1 zz
1 xxx 1 y 1 zzz
1 xxx 1 y 1 zzz
-1 xxx 1 y 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 zz
+1 xxx 1 yy 1 zz
1 xxx 1 yyy 1 z
1 xxx 1 yyy 1 z
-SELECT * FROM t1,t2,t3
-WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND
-LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
-a1 b1 a2 b2 a3 b3
2 xx 2 y 2 zz
-2 xx 2 y 2 zzzz
2 xx 2 y 2 zzz
+2 xx 2 y 2 zzzz
2 xx 2 yy 2 zz
2 xx 2 yy 2 zzz
-1 xxx 1 yy 1 z
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 z
+SELECT * FROM t1,t2,t3
+WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND
+LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
+a1 b1 a2 b2 a3 b3
+1 xxx 1 y 1 z
1 xxx 1 y 1 z
1 xxx 1 y 1 zz
1 xxx 1 y 1 zz
1 xxx 1 y 1 zzz
1 xxx 1 y 1 zzz
-1 xxx 1 y 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 zz
+1 xxx 1 yy 1 zz
1 xxx 1 yyy 1 z
1 xxx 1 yyy 1 z
-SELECT * FROM t1,t2,t3
-WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
-LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
-a1 b1 a2 b2 a3 b3
2 xx 2 y 2 zz
-2 xx 2 y 2 zzzz
2 xx 2 y 2 zzz
+2 xx 2 y 2 zzzz
2 xx 2 yy 2 zz
2 xx 2 yy 2 zzz
-1 xxx 1 yy 1 z
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 zz
-1 xxx 1 yy 1 z
+SELECT * FROM t1,t2,t3
+WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
+LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
+a1 b1 a2 b2 a3 b3
+1 xxx 1 y 1 z
1 xxx 1 y 1 z
1 xxx 1 y 1 zz
1 xxx 1 y 1 zz
1 xxx 1 y 1 zzz
1 xxx 1 y 1 zzz
-1 xxx 1 y 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 z
+1 xxx 1 yy 1 zz
+1 xxx 1 yy 1 zz
1 xxx 1 yyy 1 z
1 xxx 1 yyy 1 z
+2 xx 2 y 2 zz
+2 xx 2 y 2 zzz
+2 xx 2 y 2 zzzz
+2 xx 2 yy 2 zz
+2 xx 2 yy 2 zzz
SET SESSION optimizer_switch=DEFAULT;
DROP TABLE t1,t2,t3;
End of 5.1 tests
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index de567dbf777..017e69c8a1a 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -4150,12 +4150,15 @@ EXPLAIN SELECT * from t1,t2,t3 WHERE t3.a3=t1.a1 AND t2.a2=t1.a1;
EXPLAIN SELECT * FROM t1,t2,t3 WHERE t2.a2=t1.a1 AND t3.a3=t1.a1;
EXPLAIN SELECT * FROM t1,t2,t3 WHERE t2.a2=t1.a1 AND t3.a3=t2.a2;
+--sorted_result
SELECT * from t1,t2,t3
WHERE t3.a3=t1.a1 AND t2.a2=t1.a1 AND
LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
+--sorted_result
SELECT * FROM t1,t2,t3
WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND
LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
+--sorted_result
SELECT * FROM t1,t2,t3
WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
View Lorry Controller Status