diff options
| author | unknown <acurtis@xiphis.org> | 2005-08-11 12:18:53 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-08-11 12:18:53 +0100 |
| commit | de00ff7626c85cd8809daa85c840f0f6736c6099 (patch) | |
| tree | 7e424eae0123e35fa5eec3670a550a310c6e1916 /mysql-test/r/subselect.result | |
| parent | 98da6d5ffbaf00dfc9f2b3d18bbda665cf3fd67e (diff) | |
| parent | bf07693148f916b27e8a520965fdd556ad054806 (diff) | |
| download | mariadb-git-de00ff7626c85cd8809daa85c840f0f6736c6099.tar.gz | |
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
into xiphis.org:/usr/home/antony/work2/merge-5.0
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisammrg/myrg_static.c:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_drop_temp.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/rpl_drop_temp.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/my_time.c:
Auto merged
include/my_sys.h:
manual merge 4.1->5.0
mysql-test/r/bigint.result:
manual merge 4.1->5.0
mysql-test/r/subselect.result:
manual merge 4.1->5.0
mysql-test/t/subselect.test:
manual merge 4.1->5.0
mysys/charset.c:
manual merge 4.1->5.0
sql/ha_ndbcluster.cc:
manual merge 4.1->5.0
sql/item_strfunc.cc:
manual merge 4.1->5.0
sql/sql_base.cc:
manual merge 4.1->5.0
sql/sql_select.cc:
manual merge 4.1->5.0
sql/sql_union.cc:
manual merge 4.1->5.0
strings/Makefile.am:
manual merge 4.1->5.0
tests/mysql_client_test.c:
manual merge 4.1->5.0
Diffstat (limited to 'mysql-test/r/subselect.result')
| -rw-r--r-- | mysql-test/r/subselect.result | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 9606ed97ee7..5927419579d 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -2753,7 +2753,28 @@ WHERE ROW(one,two) IN (SELECT DISTINCT one,two FROM t1 WHERE flag = 'N'); one two flag 5 6 N 7 8 N +insert into t2 values (null,null,'N'); +SELECT one,two,ROW(one,two) IN (SELECT one,two FROM t2 WHERE flag = 'N') as 'test' from t1; +one two test +1 2 0 +2 3 0 +3 4 0 +5 6 1 +7 8 1 +SELECT one,two,ROW(one,two) IN (SELECT one,two FROM t2 WHERE flag = 'N' group by one,two) as 'test' from t1; +one two test +1 2 NULL +2 3 NULL +3 4 NULL +5 6 1 +7 8 1 DROP TABLE t1,t2; +CREATE TABLE t1 (a char(5), b char(5)); +INSERT INTO t1 VALUES (NULL,'aaa'), ('aaa','aaa'); +SELECT * FROM t1 WHERE (a,b) IN (('aaa','aaa'), ('aaa','bbb')); +a b +aaa aaa +DROP TABLE t1; create table t1 (df decimal(5,1)); insert into t1 values(1.1); insert into t1 values(2.2); |