diff options
| author | unknown <kostja@bodhi.(none)> | 2007-06-20 19:05:38 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-06-20 19:05:38 +0400 |
| commit | 5a945c3d8953a2893c6ef97449a867c0632c7426 (patch) | |
| tree | b92170caeca0bdf5f3d43d41e9f3aaee7dd72151 /mysql-test/t/join.test | |
| parent | 3f03ff9579a5d9df0b5daacc31386bdc19b58fa5 (diff) | |
| parent | cb5f8fa50b3605f4d4e069330f2ede4eded60394 (diff) | |
| download | mariadb-git-5a945c3d8953a2893c6ef97449a867c0632c7426.tar.gz | |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/t/ndb_index_ordered.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/t/greedy_optimizer.test:
Manual merge.
mysql-test/t/join.test:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'mysql-test/t/join.test')
| -rw-r--r-- | mysql-test/t/join.test | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test index 4d35989aa9a..14c98431970 100644 --- a/mysql-test/t/join.test +++ b/mysql-test/t/join.test @@ -512,10 +512,12 @@ select * from v1a join (t3 natural join t4) on a = y; #-------------------------------------------------------------------- # Negative tests (tests for errors) #-------------------------------------------------------------------- +# works in Oracle - bug -- error 1052 -select * from t1 natural join (t3 cross join t4); # works in Oracle - bug +select * from t1 natural join (t3 cross join t4); +# works in Oracle - bug -- error 1052 -select * from (t3 cross join t4) natural join t1; # works in Oracle - bug +select * from (t3 cross join t4) natural join t1; -- error 1052 select * from t1 join (t2, t3) using (b); -- error 1052 |