diff options
| author | unknown <timour@mysql.com> | 2005-08-12 19:27:54 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-08-12 19:27:54 +0300 |
| commit | f1ff2f8fdc33d122f0e1d2728538a03ae7a3c535 (patch) | |
| tree | 47cfdff5ea22001b614037779ee931abbc209636 /mysql-test/r/derived.result | |
| parent | 2eb1006fa63f4ba49ee7f59fbe49522a11723b24 (diff) | |
| parent | bcc00c1f72e08338b7865fa605052a4067e94644 (diff) | |
| download | mariadb-git-f1ff2f8fdc33d122f0e1d2728538a03ae7a3c535.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-2486-merge
mysql-test/r/errors.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/fulltext_order_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_nested.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/errors.test:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/fulltext_order_by.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join_nested.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/sql_insert.cc:
merge WL#2486
sql/sql_show.cc:
merge WL#2486
Diffstat (limited to 'mysql-test/r/derived.result')
| -rw-r--r-- | mysql-test/r/derived.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index fd6a834c694..586be94301f 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -149,8 +149,8 @@ SELECT * FROM (SELECT (SELECT * FROM (SELECT 1 as a) as a )) as b; (SELECT * FROM (SELECT 1 as a) as a ) 1 select * from (select 1 as a) b left join (select 2 as a) c using(a); -a a -1 NULL +a +1 SELECT * FROM (SELECT 1 UNION SELECT a) b; ERROR 42S22: Unknown column 'a' in 'field list' SELECT 1 as a FROM (SELECT a UNION SELECT 1) b; |