diff options
| author | unknown <serg@serg.mylan> | 2004-09-06 20:18:41 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-09-06 20:18:41 +0200 |
| commit | 50bde4930938fc26a2e2a01aa13ef9d9f344d8a4 (patch) | |
| tree | 140e87d170091903e9c7d5124bdddb496f2d8c58 /mysql-test | |
| parent | 0d34c63536031ee2e104ec8cb94e5a1a3dd68ab4 (diff) | |
| parent | e9a404525242a1e9745f479a53d4b793b844b58b (diff) | |
| download | mariadb-git-50bde4930938fc26a2e2a01aa13ef9d9f344d8a4.tar.gz | |
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/union.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/union.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 8f33bc4c316..79c589774d8 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -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; diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 65b062d663f..e55cb3ea272 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -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 |