diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-07-02 00:10:47 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-07-02 00:10:47 +0300 |
| commit | 12d879c912543fffa77cecfda799bc20ddd35df5 (patch) | |
| tree | 351c9ea12859860f3bf1ad0503470728a4a3de54 /mysql-test/t/union.test | |
| parent | 0a23db44911e9e13a3b36bec11b68cfa7a922505 (diff) | |
| download | mariadb-git-12d879c912543fffa77cecfda799bc20ddd35df5.tar.gz | |
Lot's of clean-ups and fixes for 4.0.14.
include/my_global.h:
CONFIG_SMP
mysql-test/r/grant.result:
Test cases for bug fixes
mysql-test/r/insert_select.result:
Test cases for bug fixes
mysql-test/r/union.result:
Test cases for bug fixes
mysql-test/t/grant.test:
Test cases for bug fixes
mysql-test/t/insert_select.test:
Test cases for bug fixes
mysql-test/t/union.test:
Test cases for bug fixes
sql/sql_acl.cc:
Fix for granting global privileges on db level
sql/sql_parse.cc:
Fix for INSERT... SELECT
sql/sql_select.cc:
removing a fix
sql/sql_union.cc:
P
Diffstat (limited to 'mysql-test/t/union.test')
| -rw-r--r-- | mysql-test/t/union.test | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 7262b8f78d7..5f7eba83755 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -23,6 +23,8 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g explain (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; (select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2; select found_rows(); +select sql_calc_found_rows a,b from t1 union all select a,b from t2 limit 2; +select found_rows(); # # Test some error conditions with UNION @@ -157,3 +159,14 @@ SELECT t4.uid, t5.rl, t3.gn as g1, t4.cid, t4.gid as gg FROM t3, t6, t1, t4 left (SELECT t4.uid, t5.rl, t3.gn as g1, t4.cid, t4.gid as gg FROM t3, t6, t1, t4 left join t5 on t5.rid = t4.rid left join t2 on t2.cid = t4.cid WHERE t3.gid=t4.gid AND t6.uid = t4.uid AND t3.must IS NOT NULL AND t6.uc = t1.cid AND t1.cv = "dummy" AND t6.un = "test") UNION (SELECT t4.uid, t5.rl, t3.gn as g1, t4.cid, t4.gid as gg FROM t3, t6, t1, t4 left join t5 on t5.rid = t4.rid left join t2 on t2.cid = t4.cid WHERE t3.gid=t4.gid AND t6.uid = t4.uid AND t6.uc = t1.cid AND t1.cv = "dummy" AND t6.un = "test"); drop table t1,t2,t3,t4,t5,t6; +CREATE TABLE t1 (a int not null, b char (10) not null); +insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c'); +CREATE TABLE t2 (a int not null, b char (10) not null); +insert into t2 values (3,'c'),(4,'d'),(5,'f'),(6,'e'); +create table t3 select a,b from t1 union select a,b from t2; +create table t4 (select a,b from t1) union (select a,b from t2) limit 2; +insert into t4 select a,b from t1 union select a,b from t2; +insert into t3 (select a,b from t1) union (select a,b from t2) limit 2; +select * from t3; +select * from t4; +drop table t1,t2,t3,t4; |