bk commit into 5.1 tree (jonas:1.2621)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas.  When jonas 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-05-31 08:42:53+02:00, jonas@stripped +1 -0
  fix weird test result merge change

  mysql-test/suite/ndb/r/ndb_cache_trans.result@stripped, 2008-05-31 08:42:50+02:00, jonas@stripped +1 -1
    fix weird test result merge change

diff -Nrup a/mysql-test/suite/ndb/r/ndb_cache_trans.result b/mysql-test/suite/ndb/r/ndb_cache_trans.result
--- a/mysql-test/suite/ndb/r/ndb_cache_trans.result	2008-05-28 16:26:22 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_cache_trans.result	2008-05-31 08:42:50 +02:00
@@ -1,4 +1,4 @@
-result_format 2;
+result_format: 2
 drop table if exists t1;
 set GLOBAL query_cache_type=on;
 set GLOBAL query_cache_size=1355776;