diff --git a/mysql-test/suite/tianmu/r/various_join.result b/mysql-test/suite/tianmu/r/various_join.result index f96d361fb..a3fccae21 100644 --- a/mysql-test/suite/tianmu/r/various_join.result +++ b/mysql-test/suite/tianmu/r/various_join.result @@ -22,12 +22,12 @@ insert into t6 values (1, 2), (3, 4); insert into t7 values (1, 3); insert into t8 values (1, 3); insert into t9 values (1, 2); -select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b); +select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) order by t3.a; a b a b a b 1 3 1 2 1 2 +NULL NULL NULL NULL 2 3 NULL NULL NULL NULL 3 4 NULL NULL NULL NULL 4 5 -NULL NULL NULL NULL 2 3 select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) left join t4 on (t3.a = t4.a); a b a b a b a b 1 3 1 2 1 2 1 3 @@ -61,18 +61,18 @@ NULL NULL NULL NULL 3 4 NULL NULL NULL NULL 4 5 NULL NULL NULL NULL 2 3 NULL NULL NULL NULL 1 2 -select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b and t3.a > t2.a and t3.a > t1.a); +select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b and t3.a > t2.a and t3.a > t1.a) order by t3.a; a b a b a b +NULL NULL NULL NULL 1 2 +NULL NULL NULL NULL 2 3 NULL NULL NULL NULL 3 4 NULL NULL NULL NULL 4 5 -NULL NULL NULL NULL 2 3 -NULL NULL NULL NULL 1 2 -select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b and t3.b > t2.a and t3.a < t1.b); +select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b and t3.b > t2.a and t3.a < t1.b) order by t3.a; a b a b a b 1 3 1 2 1 2 +NULL NULL NULL NULL 2 3 NULL NULL NULL NULL 3 4 NULL NULL NULL NULL 4 5 -NULL NULL NULL NULL 2 3 select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) left join t4 on (t3.a = t4.a and t2.a = t4.a) order by t3.a; a b a b a b a b 1 3 1 2 1 2 1 3 @@ -82,12 +82,12 @@ NULL NULL NULL NULL 4 5 NULL NULL select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) right join t4 on (t3.a = t4.a and t2.a = t4.a) order by t3.a; a b a b a b a b 1 3 1 2 1 2 1 3 -select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a) left join t4 on (t3.a = t4.a and t1.a = t4.a and t2.a = t4.a); +select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a) left join t4 on (t3.a = t4.a and t1.a = t4.a and t2.a = t4.a) order by t3.a; a b a b a b a b 1 3 1 2 1 2 1 3 2 3 2 4 2 3 NULL NULL -NULL NULL NULL NULL 4 5 NULL NULL NULL NULL NULL NULL 3 4 NULL NULL +NULL NULL NULL NULL 4 5 NULL NULL select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a) right join t4 on (t3.a = t4.a and t1.a = t4.a and t2.a = t4.a); a b a b a b a b 1 3 1 2 1 2 1 3 diff --git a/mysql-test/suite/tianmu/t/various_join.test b/mysql-test/suite/tianmu/t/various_join.test index ddf70f28b..d412f1374 100644 --- a/mysql-test/suite/tianmu/t/various_join.test +++ b/mysql-test/suite/tianmu/t/various_join.test @@ -32,22 +32,22 @@ insert into t7 values (1, 3); insert into t8 values (1, 3); insert into t9 values (1, 2); -select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b); +select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) order by t3.a; select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) left join t4 on (t3.a = t4.a); select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) where (t3.a = 1 or t3.a = 3); select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) where (t3.a > 1); select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t2.a = t3.a) left join t4 on (t3.a = t4.a and t1.b = t4.b) order by t3.a; select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t2.a = t3.a) left join t4 on (t3.a = t4.a and t2.b = t4.b) order by t3.a; select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b and t3.a > t1.a); -select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b and t3.a > t2.a and t3.a > t1.a); -select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b and t3.b > t2.a and t3.a < t1.b); +select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b and t3.a > t2.a and t3.a > t1.a) order by t3.a; +select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b and t3.b > t2.a and t3.a < t1.b) order by t3.a; # Below query is disabled until fixed #925 #select * from t1 left join t2 on (t1.a = t2.a) left join t3 on (t2.a = t3.a) left join t4 on (t4.a = t3.a) left join t5 on (t5.a = t2.a) left join t6 on (t5.a = t6.a and t6.a = t4.a); select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) left join t4 on (t3.a = t4.a and t2.a = t4.a) order by t3.a; select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a and t2.b = t3.b) right join t4 on (t3.a = t4.a and t2.a = t4.a) order by t3.a; -select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a) left join t4 on (t3.a = t4.a and t1.a = t4.a and t2.a = t4.a); +select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a) left join t4 on (t3.a = t4.a and t1.a = t4.a and t2.a = t4.a) order by t3.a; select * from t1 inner join t2 on (t1.a = t2.a) right join t3 on (t1.a = t3.a) right join t4 on (t3.a = t4.a and t1.a = t4.a and t2.a = t4.a); # Below query is disabled until fixed #925