From 7182785f19fadef1fbe14c75607e109d6185206d Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Fri, 17 Feb 2006 10:02:59 -0800
Subject: [PATCH] Fix subselect results (there was a bad merge when subselect
 test was disabled)

---
 .bzrignore                    | 1 +
 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