diff options
| author | unknown <jimw@mysql.com> | 2006-02-17 10:02:59 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-02-17 10:02:59 -0800 |
| commit | eae6679fd4a55a1798f2c20385507f869c85e7a6 (patch) | |
| tree | 4e28662ff02f85eb8017723e5fb8f2691fbda056 | |
| parent | dd6e56b903afc978bb0b3273727cb59c23786b1b (diff) | |
| download | mariadb-git-eae6679fd4a55a1798f2c20385507f869c85e7a6.tar.gz | |
Fix subselect results (there was a bad merge when subselect test was disabled)
BitKeeper/etc/ignore:
Added scripts/mysql_upgrade to the ignore list
mysql-test/r/subselect.result:
Update results
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | mysql-test/r/subselect.result | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index a210762d46a..a16ed70a812 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1273,3 +1273,4 @@ vio/viotest-sslconnect.cpp vio/viotest.cpp zlib/*.ds? zlib/*.vcproj +scripts/mysql_upgrade diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 85976c211c5..6094d23b0d0 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -215,9 +215,9 @@ select * from t1 where t1.a=(select t2.a from t2 where t2.b=(select max(a) from a select b,(select avg(t2.a+(select min(t3.a) from t3 where t3.a >= t4.a)) from t2) from t4; b (select avg(t2.a+(select min(t3.a) from t3 where t3.a >= t4.a)) from t2) -8 7.5 -8 4.5 -9 7.5 +8 7.5000 +8 4.5000 +9 7.5000 explain extended select b,(select avg(t2.a+(select min(t3.a) from t3 where t3.a >= t4.a)) from t2) from t4; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t4 ALL NULL NULL NULL NULL 3 |