bk commit into 5.1 tree (tomas:1.2552)

[tomas]

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-06-20 06:37:09+02:00, tomas@stripped +12 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-6.1
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-6.2
  MERGE: 1.2403.16.155

  cluster_change_hist.txt@stripped, 2007-06-20 06:34:47+02:00, tomas@stripped
+0 -0
    Auto merged
    MERGE: 1.6.1.23

  configure.in@stripped, 2007-06-20 06:34:54+02:00, tomas@stripped +0 -2
    null merge
    MERGE: 1.420.8.14

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2007-06-20 06:34:48+02:00,
tomas@stripped +0 -3
    Auto merged
    MERGE: 1.32.1.6

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-06-20 06:34:48+02:00,
tomas@stripped +0 -13
    Auto merged
    MERGE: 1.101.1.15

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-06-20 06:34:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.57.1.9

  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@stripped, 2007-06-20 06:35:48+02:00,
tomas@stripped +0 -1
    null merge
    MERGE: 1.10.1.4

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2007-06-20 06:34:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.18.1.7

  storage/ndb/src/kernel/blocks/pgman.cpp@stripped, 2007-06-20 06:34:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.21.1.6

  storage/ndb/src/kernel/vm/SimulatedBlock.hpp@stripped, 2007-06-20 06:34:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.32.1.1

  storage/ndb/src/ndbapi/TransporterFacade.cpp@stripped, 2007-06-20 06:34:48+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.57.2.3

  storage/ndb/test/ndbapi/testSystemRestart.cpp@stripped, 2007-06-20 06:36:58+02:00,
tomas@stripped +0 -6
    null merge
    MERGE: 1.13.1.1

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-06-20 06:34:48+02:00,
tomas@stripped +0 -4
    Auto merged
    MERGE: 1.66.1.15

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.2/RESYNC

--- 1.21/cluster_change_hist.txt	2007-06-09 07:25:43 +02:00
+++ 1.22/cluster_change_hist.txt	2007-06-20 06:34:47 +02:00
@@ -2,7 +2,25 @@
 mysql-5.1.15-ndb-6.1.X
 ==================================================
 
-mysql-5.1.15-ndb-6.1.11 (2007-05-06)
+mysql-5.1.15-ndb-6.1.15 (2007-06-20)
+
+  Bug #29229 memory corruption in dbtup
+
+mysql-5.1.15-ndb-6.1.14 (2007-06-19)
+
+  Bug #29176 missing stack pruning in drop_page
+  Bug #29167 Insufficient nodes for SR
+
+mysql-5.1.15-ndb-6.1.13 (2007-06-15)
+
+  Bug #29099 slow backup for disk data
+
+mysql-5.1.15-ndb-6.1.12 (2007-06-13)
+
+  Bug #29044 memory buddy allocator "unoptimal" memory handling
+  extend backup dump to give more info
+
+mysql-5.1.15-ndb-6.1.11 (2007-06-06)
 
   Bug #28751 Lots of memory locked in memory causes high kswapd
   Bug #28899 not possible to set separate watchdog timeout at startup