making the keyword ROW for row items optional

2 files changed, 25 insertions, 11 deletions

diff --git a/mysql-test/r/row.result b/mysql-test/r/row.result
index f3522e05380..d86ae6c7961 100644
--- a/mysql-test/r/row.result
+++ b/mysql-test/r/row.result
@@ -1,6 +1,6 @@
 drop table if exists t1;
-select row(1,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3));
-row(1,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3))
+select (1,2,3) IN ((3,2,3), (1,2,3), (1,3,3));
+(1,2,3) IN ((3,2,3), (1,2,3), (1,3,3))
 1
 select row(10,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3));
 row(10,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3))
@@ -32,14 +32,23 @@ NULL
 select row('b',1.5,3) IN (row('b',NULL,4), row('a',1.5,3), row(1,3,3));
 row('b',1.5,3) IN (row('b',NULL,4), row('a',1.5,3), row(1,3,3))
 0
-select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,4)));
-row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,4)))
+select (1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4)));
+(1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4)))
 1
 select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,4));
 Cardinality error (more/less than 2 columns)
 select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL)));
 row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL)))
 NULL
+SELECT (1,2,3)=(0,NULL,3);
+(1,2,3)=(0,NULL,3)
+0
+SELECT (1,2,3)=(1,NULL,3);
+(1,2,3)=(1,NULL,3)
+NULL
+SELECT (1,2,3)=(1,NULL,0);
+(1,2,3)=(1,NULL,0)
+NULL
 SELECT ROW(1,2,3)=ROW(1,2,3);
 ROW(1,2,3)=ROW(1,2,3)
 1
@@ -132,4 +141,6 @@ select 1 from t1 where ROW(1,1);
 Cardinality error (more/less than 1 columns)
 select count(*) from t1 order by ROW(1,1);
 Cardinality error (more/less than 1 columns)
+select count(*) from t1 having (1,1) order by i;
+Cardinality error (more/less than 1 columns)
 drop table t1;
diff --git a/mysql-test/t/row.test b/mysql-test/t/row.test
index 099eaa95c77..98fd640f12e 100644
--- a/mysql-test/t/row.test
+++ b/mysql-test/t/row.test
@@ -3,7 +3,7 @@
 drop table if exists t1;
 --enable_warnings
 
-select row(1,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3));
+select (1,2,3) IN ((3,2,3), (1,2,3), (1,3,3));
 select row(10,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3));
 select row(1,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
 select row(10,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
@@ -14,11 +14,16 @@ select row('a',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
 select row('b',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
 select row('b',1.5,3) IN (row('b',NULL,3), row('a',1.5,3), row(1,3,3));
 select row('b',1.5,3) IN (row('b',NULL,4), row('a',1.5,3), row(1,3,3));
-select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,4)));
+select (1,2,(3,4)) IN ((3,2,(3,4)), (1,2,(3,4)));
 -- error 1239
 select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,4));
 select row(1,2,row(3,4)) IN (row(3,2,row(3,4)), row(1,2,row(3,NULL)));
 
+SELECT (1,2,3)=(0,NULL,3);
+SELECT (1,2,3)=(1,NULL,3);
+# here's something for Sanja to fix :)
+SELECT (1,2,3)=(1,NULL,0);
+
 SELECT ROW(1,2,3)=ROW(1,2,3);
 SELECT ROW(2,2,3)=ROW(1+1,2,3);
 SELECT ROW(1,2,3)=ROW(1+1,2,3);
@@ -58,9 +63,7 @@ create table t1 (i int);
 select 1 from t1 where ROW(1,1);
 -- error 1239
 select count(*) from t1 order by ROW(1,1);
-#TODO remove comments after parser fixing
-#-- error 1239
-#select count(*) from t1 order by i having (1,1);
-#-- error 1239
-#select 1 from t1 limit (1,1), (1,1);
+-- error 1239
+select count(*) from t1 having (1,1) order by i;
 drop table t1;
+