diff options
| author | unknown <monty@mysql.com> | 2005-04-01 15:06:35 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-01 15:06:35 +0300 |
| commit | 2fcf31fba76356a03c333f52675868ac8c161ec8 (patch) | |
| tree | 0c7ef48f52e3bfe3c659c446004364da743f630b /mysql-test/t/subselect.test | |
| parent | 64455348e669da10270dac20c6e57ba8cc3e9678 (diff) | |
| parent | ec6be08bc6406b19cfa4fc65262e652f44ad7df8 (diff) | |
| download | mariadb-git-2fcf31fba76356a03c333f52675868ac8c161ec8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/subselect.test')
| -rw-r--r-- | mysql-test/t/subselect.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 55278ad40f8..3bb1da0eddf 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -46,9 +46,9 @@ SELECT ROW(1,2,3) > (SELECT 1,2,1); SELECT ROW(1,2,3) = (SELECT 1,2,NULL); SELECT (SELECT 1.5,2,'a') = ROW(1.5,2,'a'); SELECT (SELECT 1.5,2,'a') = ROW(1.5,2,'b'); -SELECT (SELECT 1.5,2,'a') = ROW('b',2,'b'); +SELECT (SELECT 1.5,2,'a') = ROW('1.5b',2,'b'); SELECT (SELECT 'b',2,'a') = ROW(1.5,2,'a'); -SELECT (SELECT 1.5,2,'a') = ROW(1.5,'c','a'); +SELECT (SELECT 1.5,2,'a') = ROW(1.5,'2','a'); SELECT (SELECT 1.5,'c','a') = ROW(1.5,2,'a'); -- error 1241 |