From 82103ed9b37aa022456795d8d29eb242ad080e8d Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Sun, 11 Jun 2006 09:04:23 +0200
Subject: [PATCH] Update test results Fix merge problem

---
 mysql-test/r/join_outer_innodb.result | 4 ++--
 mysql-test/t/group_min_max.test       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/join_outer_innodb.result b/mysql-test/r/join_outer_innodb.result
index dfc6bd49318..e8a2d6f668b 100644
--- a/mysql-test/r/join_outer_innodb.result
+++ b/mysql-test/r/join_outer_innodb.result
@@ -14,6 +14,6 @@ EXPLAIN
 SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 
 WHERE t1.name LIKE 'A%' OR FALSE;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	PRIMARY,name	name	23	NULL	3	Using where; Using index
-1	SIMPLE	t2	ref	fkey	fkey	5	test.t1.id	1	Using where; Using index
+1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index
+1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where
 DROP TABLE t1,t2;
diff --git a/mysql-test/t/group_min_max.test b/mysql-test/t/group_min_max.test
index 292b5cde77f..fec51a24920 100644
--- a/mysql-test/t/group_min_max.test
+++ b/mysql-test/t/group_min_max.test
@@ -683,6 +683,8 @@ select distinct a1 from t1 where a2 = 'b';
 # Test case moved to group_min_max_innodb
 
 
+drop table t1,t2,t3;
+
 #
 # Bug #14920 Ordering aggregated result sets with composite primary keys
 # corrupts resultset