diff options
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/row.result | 14 | ||||
-rw-r--r-- | mysql-test/r/subselect.result | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/r/row.result b/mysql-test/r/row.result index 94186f254c4..ab60f714d82 100644 --- a/mysql-test/r/row.result +++ b/mysql-test/r/row.result @@ -36,7 +36,7 @@ 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)); -ERROR 21000: Cardinality error (more/less than 2 columns) +ERROR 21000: Operand should contain 2 column(s) 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 @@ -86,7 +86,7 @@ SELECT ROW('test',2,3.33)=ROW('test',2,3.33); ROW('test',2,3.33)=ROW('test',2,3.33) 1 SELECT ROW('test',2,3.33)=ROW('test',2,3.33,4); -ERROR 21000: Cardinality error (more/less than 3 columns) +ERROR 21000: Operand should contain 3 column(s) SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,33)); ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,33)) 1 @@ -97,7 +97,7 @@ SELECT ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,NULL)); ROW('test',2,ROW(3,33))=ROW('test',2,ROW(3,NULL)) NULL SELECT ROW('test',2,ROW(3,33))=ROW('test',2,4); -ERROR 21000: Cardinality error (more/less than 2 columns) +ERROR 21000: Operand should contain 2 column(s) create table t1 ( a int, b int, c int); insert into t1 values (1,2,3), (2,3,1), (3,2,1), (1,2,NULL); select * from t1 where ROW(1,2,3)=ROW(a,b,c); @@ -135,14 +135,14 @@ ROW(1,2,3) IN(row(a,b,c), row(1,2,3)) 1 drop table t1; select ROW(1,1); -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) create table t1 (i int); select 1 from t1 where ROW(1,1); -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) select count(*) from t1 order by ROW(1,1); -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) select count(*) from t1 having (1,1) order by i; -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) drop table t1; create table t1 (a int, b int); insert into t1 values (1, 4); diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 82110e34364..d5186dc9c44 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -59,7 +59,7 @@ SELECT * FROM (SELECT 1 as id) b WHERE id IN (SELECT * FROM (SELECT 1 as id) c O id 1 SELECT * FROM (SELECT 1) a WHERE 1 IN (SELECT 1,1); -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) SELECT 1 IN (SELECT 1); 1 IN (SELECT 1) 1 @@ -124,7 +124,7 @@ SELECT (SELECT 1.5,'c','a') = ROW(1.5,2,'a'); (SELECT 1.5,'c','a') = ROW(1.5,2,'a') 0 SELECT (SELECT * FROM (SELECT 'test' a,'test' b) a); -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) SELECT 1 as a,(SELECT a+a) b,(SELECT b); a b (SELECT b) 1 2 2 @@ -257,9 +257,9 @@ a 7 delete from t2 where a=100; select * from t3 where a in (select a,b from t2); -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) select * from t3 where a in (select * from t2); -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) insert into t4 values (12,7),(1,7),(10,9),(9,6),(7,6),(3,9),(1,10); select b,max(a) as ma from t4 group by b having b < (select max(t2.a) from t2 where t2.b=t4.b); b ma @@ -346,10 +346,10 @@ id select_type table type possible_keys key key_len ref rows Extra 3 SUBQUERY t8 const PRIMARY PRIMARY 35 1 SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo,email FROM t8 WHERE pseudo='joce'); -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) SELECT pseudo FROM t8 WHERE pseudo=(SELECT * FROM t8 WHERE pseudo='joce'); -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'); pseudo joce @@ -1377,7 +1377,7 @@ userid pmtotal pmnew calc_total calc_new drop table t1, t2; create table t1 (s1 char(5)); select (select 'a','b' from t1 union select 'a','b' from t1) from t1; -ERROR 21000: Cardinality error (more/less than 1 columns) +ERROR 21000: Operand should contain 1 column(s) insert into t1 values ('tttt'); select * from t1 where ('a','b')=(select 'a','b' from t1 union select 'a','b' from t1); s1 |