bk commit into 6.0 tree (mskold:1.2605)

[Martin Skold]

Below is the list of changes that have just been committed into a local
6.0 repository of mskold.  When mskold 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@stripped, 2008-03-25 12:21:19+01:00, mskold@stripped +1 -0
  Re-generated result file

  mysql-test/suite/ndb/r/ndb_condition_pushdown.result@stripped, 2008-03-25 12:21:12+01:00,
mskold@stripped +1 -1
    Re-generated result file

diff -Nrup a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result
b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result
--- a/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2008-03-20 10:20:04 +01:00
+++ b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result	2008-03-25 12:21:12 +01:00
@@ -1910,7 +1910,7 @@ insert into NodeAlias VALUES(null, 8 , '
 12:22:26');
 explain select * from NodeAlias where (aliasKey LIKE '491803%');
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NodeAlias	range	NodeAlias_KeyIndex	NodeAlias_KeyIndex	48	NULL	10	Using where
with pushed condition
+1	SIMPLE	NodeAlias	range	NodeAlias_KeyIndex	NodeAlias_KeyIndex	48	NULL	10	Using where
with pushed condition; Using MRR
 select * from NodeAlias where (aliasKey LIKE '491803%') order by id;
 id	nodeId	displayName	aliasKey	objectVersion	changed
 7	8	491803%	491803%	0	2008-03-10 12:22:26