bk commit into 5.1 tree (cmiller:1.2362)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2362 06/04/24 16:05:57 cmiller@zippy.(none) +1 -0
  Manual merge fix.

  mysql-test/r/innodb.result
    1.174 06/04/24 16:05:53 cmiller@zippy.(none) +2 -2
    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.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/merge/mysql-5.1-new

--- 1.173/mysql-test/r/innodb.result	2006-04-24 14:49:01 -04:00
+++ 1.174/mysql-test/r/innodb.result	2006-04-24 16:05:53 -04:00
@@ -1305,14 +1305,14 @@
 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);