bk commit into 5.0 tree (ingo:1.2050)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev 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.2050 06/02/16 08:59:55 ingo@stripped +2 -0
  Merge mysql.com:/home/mydev/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-bug8841

  mysql-test/r/myisam.result
    1.73 06/02/16 08:59:48 ingo@stripped +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.156 06/02/16 08:59:48 ingo@stripped +0 -0
    Auto merged

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-bug8841/RESYNC

--- 1.155/mysql-test/r/innodb.result	2006-01-31 19:41:42 +01:00
+++ 1.156/mysql-test/r/innodb.result	2006-02-16 08:59:48 +01:00
@@ -1457,16 +1457,16 @@
 checksum table t1, t2, t3, t4;
 Table	Checksum
 test.t1	2948697075
-test.t2	3835700799
-test.t3	3835700799
+test.t2	2948697075
+test.t3	2948697075
 test.t4	NULL
 Warnings:
 Error	1146	Table 'test.t4' doesn't exist
 checksum table t1, t2, t3, t4 extended;
 Table	Checksum
-test.t1	3092701434
-test.t2	3835700799
-test.t3	3835700799
+test.t1	2948697075
+test.t2	2948697075
+test.t3	2948697075
 test.t4	NULL
 Warnings:
 Error	1146	Table 'test.t4' doesn't exist

--- 1.72/mysql-test/r/myisam.result	2006-02-01 16:46:39 +01:00
+++ 1.73/mysql-test/r/myisam.result	2006-02-16 08:59:48 +01:00
@@ -567,7 +567,7 @@
 Note	1031	Table storage engine for 't1' doesn't have this option
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	NULL	1000	NULL	NULL	YES	HASH	
+t1	1	a	1	a	NULL	500	NULL	NULL	YES	HASH	
 drop table t1,t2;
 create table t1 ( a tinytext, b char(1), index idx (a(1),b) );
 insert into t1 values (null,''), (null,'');