Commit eae6679f authored by unknown's avatar unknown
Browse files

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
parent dd6e56b9

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1273,3 +1273,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

scripts/mysql_upgrade

mysql-test/r/subselect.result

+3 −3
Original line number Diff line number Diff line
@@ -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