diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-26 20:04:22 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-26 20:04:22 +0200 |
| commit | dcf6470f3100bbe7d7d78a47956b6713b0532af3 (patch) | |
| tree | 1dc9179ee92fbd1e2d385609bb97b83782c95a5d /mysql-test/r/derived.result | |
| parent | 1e687d196ef059ff82542d1f0a71111c8a0b257a (diff) | |
| parent | 5265a1656ea58d9534ebadfbd45c662080f89bb0 (diff) | |
| download | mariadb-git-dcf6470f3100bbe7d7d78a47956b6713b0532af3.tar.gz | |
merge fixes
mysql-test/r/derived.result:
Auto merged
mysql-test/t/derived.test:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item.cc:
Fixes for merge ...
Diffstat (limited to 'mysql-test/r/derived.result')
| -rw-r--r-- | mysql-test/r/derived.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index f7cd45090c4..e2d2b1cb652 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -1,3 +1,10 @@ +select * from (select 2 from DUAL) b; +2 +2 +SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b; +Unknown column 'a' in 'field list' +SELECT 1 as a FROM (SELECT a UNION SELECT 1) b; +Unknown column 'a' in 'field list' drop table if exists t1,t2,t3; CREATE TABLE t1 (a int not null, b char (10) not null); insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c'); |