From: Date: October 9 2007 8:21am
Subject: bk commit into 5.1 tree (tomas:1.2617)
List-Archive: http://lists.mysql.com/commits/35164
Message-Id: <20071009062109.7AD6718114B76@linux.local>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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, 2007-10-09 08:21:04+02:00, tomas@stripped +1 -0
  WL#4080
  - correct result file

  mysql-test/suite/ndb/r/ndb_basic.result@stripped, 2007-10-09 08:21:01+02:00, tomas@stripped +1 -0
    WL#4080
    - correct result file

diff -Nrup a/mysql-test/suite/ndb/r/ndb_basic.result b/mysql-test/suite/ndb/r/ndb_basic.result
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2007-09-12 20:50:58 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2007-10-09 08:21:01 +02:00
@@ -14,6 +14,7 @@ Ndb_config_from_host	#
 Ndb_config_from_port	#
 Ndb_number_of_data_nodes	#
 Ndb_conflict_fn_max	#
+Ndb_conflict_fn_old	#
 SHOW GLOBAL VARIABLES LIKE 'ndb%';
 Variable_name	Value
 ndb_autoincrement_prefetch_sz	#