diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-02-14 20:24:49 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-02-14 20:24:49 +0200 |
| commit | 1754bebea0bbcff8af4d9623e7785257ab24f7f9 (patch) | |
| tree | df8e21f0ec68352a23ab8c368a2b9df0fc418297 /mysql-test/t/union.test | |
| parent | 6eb632a464ed45adc71d0afd74ba99586689bb4a (diff) | |
| parent | be81960241cf75e617701adc93d3deaa6f5eea7f (diff) | |
| download | mariadb-git-1754bebea0bbcff8af4d9623e7785257ab24f7f9.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
mysql-test/t/union.test:
Auto merged
Diffstat (limited to 'mysql-test/t/union.test')
| -rw-r--r-- | mysql-test/t/union.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 2ea2741a621..d9fb78b1554 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -213,7 +213,7 @@ select found_rows(); (SELECT SQL_CALC_FOUND_ROWS * FROM t1) UNION all (SELECT * FROM t2 LIMIT 1); select found_rows(); # This used to work in 4.0 but not anymore in 4.1 ---error 1149 +--error 1064 (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1; #select found_rows(); |