diff options
| author | unknown <evgen@moonbone.local> | 2007-04-15 12:05:13 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-04-15 12:05:13 +0400 |
| commit | 663757ea2559823d0ed639aa7d09653535110b8e (patch) | |
| tree | b537d185a31ec756d7fdb93c7cc69323c615d976 /mysql-test/r/subselect3.result | |
| parent | ebb4e90cd9e3aeeeeabd8de5f91670be4fb20c82 (diff) | |
| parent | 3e8252ffc6ff28df8b0dbadcfea6ca506a731cbf (diff) | |
| download | mariadb-git-663757ea2559823d0ed639aa7d09653535110b8e.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
mysql-test/r/subselect3.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/subselect.test:
Manual merge
Diffstat (limited to 'mysql-test/r/subselect3.result')
| -rw-r--r-- | mysql-test/r/subselect3.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/subselect3.result b/mysql-test/r/subselect3.result index 4b8ece1c931..18feb7cb6b9 100644 --- a/mysql-test/r/subselect3.result +++ b/mysql-test/r/subselect3.result @@ -432,7 +432,7 @@ alter table t1 add index idx(oref,ie); explain select oref, a, a in (select ie from t1 where oref=t2.oref) Z from t2; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 ALL NULL NULL NULL NULL 7 -2 DEPENDENT SUBQUERY t1 ref_or_null idx idx 10 t2.oref,func 4 Using where; Using index; Full scan on NULL key +2 DEPENDENT SUBQUERY t1 ref_or_null idx idx 10 test.t2.oref,func 4 Using where; Using index; Full scan on NULL key select oref, a, a in (select ie from t1 where oref=t2.oref) Z from t2; oref a Z ee NULL NULL @@ -457,7 +457,7 @@ group by grp having min(ie) > 1) Z from t2; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 ALL NULL NULL NULL NULL 7 -2 DEPENDENT SUBQUERY t1 ref idx idx 5 t2.oref 2 Using where; Using temporary; Using filesort +2 DEPENDENT SUBQUERY t1 ref idx idx 5 test.t2.oref 2 Using where; Using temporary; Using filesort select oref, a, a in (select min(ie) from t1 where oref=t2.oref group by grp having min(ie) > 1) Z |