Merge with 4.0 to get fix for MIN/MAX

1 files changed, 24 insertions, 2 deletions

diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test
index 2a3b8488ca0..59c0c37e40d 100644
--- a/mysql-test/t/join.test
+++ b/mysql-test/t/join.test
@@ -1,10 +1,32 @@
 #
-# This failed for lia Perminov
-#
+# Initialization
 --disable_warnings
 drop table if exists t1,t2,t3;
 --enable_warnings
 
+#
+# Test different join syntaxes
+#
+
+CREATE TABLE t1 (S1 INT);
+CREATE TABLE t2 (S1 INT);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (2);
+SELECT * FROM t1 JOIN t2;
+SELECT * FROM t1 INNER JOIN t2;
+SELECT * from t1 JOIN t2 USING (S1);
+SELECT * FROM t1 INNER JOIN t2 USING (S1);
+SELECT * from t1 CROSS JOIN t2;
+SELECT * from t1 LEFT JOIN t2 USING(S1);
+SELECT * from t1 LEFT JOIN t2 ON(t2.S1=2);
+SELECT * from t1 RIGHT JOIN t2 USING(S1);
+SELECT * from t1 RIGHT JOIN t2 ON(t1.S1=1);
+drop table t1,t2;
+
+#
+# This failed for lia Perminov
+#
+
 create table t1 (id int primary key);
 create table t2 (id int);
 insert into t1 values (75);