Commit 50bde493 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.0/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.0


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
parents 0d34c635 e9a40452

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -545,3 +545,4 @@ vio/test-sslserver 
vio/viotest-ssl

scripts/make_win_binary_distribution

EXCEPTIONS-CLIENT

support-files/my-innodb-heavy-4G.cnf

mysql-test/r/union.result

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ a 
(SELECT * FROM t1) UNION all (SELECT SQL_CALC_FOUND_ROWS * FROM t2) LIMIT 1;

Wrong usage/placement of 'SQL_CALC_FOUND_ROWS'

create temporary table t1 select a from t1 union select a from t2;

drop table t1;

create table t1 select a from t1 union select a from t2;

INSERT TABLE 't1' isn't allowed in FROM table list

select a from t1 union select a from t2 order by t2.a;

mysql-test/t/union.test

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a desc LIMIT 1; 
(SELECT * FROM t1) UNION all (SELECT SQL_CALC_FOUND_ROWS * FROM t2) LIMIT 1;



create temporary table t1 select a from t1 union select a from t2;

drop table t1;

--error 1093

create table t1 select a from t1 union select a from t2;

--error 1054