bk commit into 5.0 tree (ingo:1.2010) BUG#10178

[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.2010 05/06/24 19:19:21 ingo@stripped +2 -0
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  After merge fixes of test result.

  mysql-test/r/heap_hash.result
    1.17 05/06/24 19:19:11 ingo@stripped +1 -1
    Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
    After merge fixes of test result.

  mysql-test/r/heap.result
    1.39 05/06/24 19:19:11 ingo@stripped +4 -4
    Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
    After merge fixes of test result.

# 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-5000

--- 1.16/mysql-test/r/heap_hash.result	Fri Jun 24 18:02:59 2005
+++ 1.17/mysql-test/r/heap_hash.result	Fri Jun 24 19:19:11 2005
@@ -353,8 +353,8 @@
 t3	1	a	2	b	NULL	13	NULL	NULL		HASH	
 explain select * from t1 ignore key(btree_idx), t3 where t1.name='matt' and t3.a =
concat('',t1.name) and t3.b=t1.name;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t3	ref	a	a	44	const,const	7	Using where
 1	SIMPLE	t1	ref	heap_idx	heap_idx	22	const	7	Using where
+1	SIMPLE	t3	ref	a	a	44	const,const	7	Using where
 drop table t1, t2, t3;
 create temporary table t1 ( a int, index (a) ) engine=memory;
 insert into t1 values (1),(2),(3),(4),(5);

--- 1.38/mysql-test/r/heap.result	Fri Jun 10 06:20:31 2005
+++ 1.39/mysql-test/r/heap.result	Fri Jun 24 19:19:11 2005
@@ -367,13 +367,13 @@
 9
 explain select count(*) from t1 where v='a  ';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	13	const	9	Using where
+1	SIMPLE	t1	ref	v	v	13	const	10	Using where
 explain select count(*) from t1 where c='a  ';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	c	c	11	const	9	Using where
+1	SIMPLE	t1	ref	c	c	11	const	10	Using where
 explain select count(*) from t1 where t='a  ';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	t	t	13	const	9	Using where
+1	SIMPLE	t1	ref	t	t	13	const	10	Using where
 explain select count(*) from t1 where v like 'a%';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	v	NULL	NULL	NULL	271	Using where
@@ -399,7 +399,7 @@
 *a         *a*a         *
 explain select * from t1 where v='a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	13	const	9	Using where
+1	SIMPLE	t1	ref	v	v	13	const	10	Using where
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a
	1