bk commit into 5.1 tree (jonas:1.2444)

[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, 2007-02-19 21:44:49+01:00, jonas@stripped +13 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/telco-6.1
  into  perch.ndb.mysql.com:/home/jonas/src/51-telco
  MERGE: 1.2403.15.11

  cluster_change_hist.txt@stripped, 2007-02-19 21:36:57+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.3

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2007-02-19 21:36:57+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.32.1.1

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@stripped, 2007-02-19 21:36:57+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.26.1.1

  storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@stripped, 2007-02-19 21:36:57+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.18.2.1

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-02-19 21:44:47+01:00,
jonas@stripped +0 -2
    merge
    MERGE: 1.101.1.2

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-02-19 21:36:58+01:00,
jonas@stripped +0 -1
    Auto merged
    MERGE: 1.134.2.1

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2007-02-19 21:36:58+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.44.2.1

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@stripped, 2007-02-19 21:36:58+01:00,
jonas@stripped +0 -3
    Auto merged
    MERGE: 1.54.1.1

  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp@stripped, 2007-02-19 21:36:58+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.25.2.1

  storage/ndb/test/include/NdbRestarter.hpp@stripped, 2007-02-19 21:36:58+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.10.1.1

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-02-19 21:44:47+01:00,
jonas@stripped +0 -39
    merge
    MERGE: 1.40.1.1

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-02-19 21:36:58+01:00,
jonas@stripped +0 -4
    Auto merged
    MERGE: 1.66.1.1

  storage/ndb/test/src/NdbRestarter.cpp@stripped, 2007-02-19 21:36:58+01:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.16.1.1

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-telco/RESYNC

--- 1.8/cluster_change_hist.txt	2007-02-19 21:44:55 +01:00
+++ 1.9/cluster_change_hist.txt	2007-02-19 21:44:55 +01:00
@@ -4,6 +4,7 @@
 
 mysql-5.1.15-ndb-6.1.3 (not released yet)
 
+  Bug #25239 - Out of memory problem can cause crash in SUMA
   Bug #21033 - Error 0 in readAutoIncrementValue()
   Bug #26293 - cluster mgmt node sometimes doesn't receive events from all nodes on
restart