From aa19a8f2b4a98f580bd03d7126e5b130d419dcf9 Mon Sep 17 00:00:00 2001
From: unknown <cmiller@zippy.(none)>
Date: Mon, 24 Apr 2006 16:05:57 -0400
Subject: Manual merge fix.

mysql-test/r/innodb.result:
  Corrected from manual merge.  I know the numbers are right (it's a
  7,7-seeded fibbonaci sequence), but I don't know how I missed the latter
  line.
---
 mysql-test/r/innodb.result | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index a7e425cfa4d..f32d7ee264a 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1305,14 +1305,14 @@ insert into t2 (a) select b from t1;
 insert into t1 (a) select b from t2;
 select count(*) from t1;
 count(*)
-623
+29267
 explain select * from t1 where c between 1 and 2500;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	c	c	5	NULL	#	Using where
 update t1 set c=a;
 explain select * from t1 where c between 1 and 2500;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	c	NULL	NULL	NULL	#	Using where
+1	SIMPLE	t1	range	c	c	5	NULL	#	Using where
 drop table t1,t2;
 create table t1 (id int primary key auto_increment, fk int, index index_fk (fk)) engine=innodb;
 insert into t1 (id) values (null),(null),(null),(null),(null);
-- 
cgit v1.2.1