diff options
| author | unknown <igor@olga.mysql.com> | 2007-04-11 11:57:40 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-04-11 11:57:40 -0700 |
| commit | 0ec3c2212e418ea1917ec10b7ce810fda75fcf40 (patch) | |
| tree | 3750b517ef9032b9c09ecd53c6f54734d5a38faa /mysql-test/r/row.result | |
| parent | b518d2a8bd328f9bb985b211382a97e55059a92c (diff) | |
| parent | aa051961c9ac4629fd7dca9f236172e47660bbeb (diff) | |
| download | mariadb-git-0ec3c2212e418ea1917ec10b7ce810fda75fcf40.tar.gz | |
Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27484
into olga.mysql.com:/home/igor/mysql-5.0-opt
mysql-test/t/row.test:
Auto merged
mysql-test/r/row.result:
Manual merge
sql/item_cmpfunc.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/row.result')
| -rw-r--r-- | mysql-test/r/row.result | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/mysql-test/r/row.result b/mysql-test/r/row.result index faf9b11d7c9..3a8ab6b8346 100644 --- a/mysql-test/r/row.result +++ b/mysql-test/r/row.result @@ -175,12 +175,24 @@ ROW(2,10) <=> ROW(3,4) SELECT ROW(NULL,10) <=> ROW(3,NULL); ROW(NULL,10) <=> ROW(3,NULL) 0 -SELECT ROW(1,1,1) = ROW(1,1,1) as `1`, ROW(1,1,1) = ROW(1,2,1) as `0`, ROW(1,NULL,1) = ROW(2,2,1) as `0`, ROW(1,NULL,1) = ROW(1,2,2) as `0`, ROW(1,NULL,1) = ROW(1,2,1) as `null` ; -1 0 0 0 null -1 0 0 0 NULL -select row(NULL,1)=(2,0); -row(NULL,1)=(2,0) -0 +SELECT ROW(1,ROW(2,3)) IN (ROW(1,ROW(2,3)),ROW(1,1)); +ERROR 21000: Operand should contain 2 column(s) +SELECT ROW(1,ROW(2,3)) IN (ROW(1,ROW(2,3)),ROW(1,1),ROW(1,ROW(2,3))); +ERROR 21000: Operand should contain 2 column(s) +SELECT ROW(1,ROW(2,3)) IN (ROW(1,ROW(2,3)),ROW(1,ROW(2,2,2))); +ERROR 21000: Operand should contain 2 column(s) +SELECT ROW(1,ROW(2,3,4)) IN (ROW(1,ROW(2,3,4)),ROW(1,ROW(2,2))); +ERROR 21000: Operand should contain 3 column(s) +SELECT ROW(1,ROW(2,3)) IN (ROW(1,ROW(2,3)),(SELECT 1,1)); +ERROR 21000: Operand should contain 2 column(s) +SELECT ROW(1,ROW(2,3)) IN (ROW(1,ROW(2,3)),(SELECT 1,1),ROW(1,ROW(2,4))); +ERROR 21000: Operand should contain 2 column(s) +SELECT ROW(1,ROW(2,3)) IN ((SELECT 1,1),ROW(1,ROW(2,3))); +ERROR 21000: Operand should contain 2 column(s) +SELECT ROW(2,1) IN (ROW(21,2),ROW(ROW(1,1,3),0)); +ERROR 21000: Operand should contain 1 column(s) +SELECT ROW(2,1) IN (ROW(ROW(1,1,3),0),ROW(21,2)); +ERROR 21000: Operand should contain 1 column(s) CREATE TABLE t1 (a int, b int, PRIMARY KEY (a,b)); INSERT INTO t1 VALUES (1,1), (2,1), (3,1), (1,2), (3,2), (3,3); EXPLAIN SELECT * FROM t1 WHERE a=3 AND b=2; |