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-09 07:25:49+02:00, tomas@stripped +17 -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
MERGE: 1.2403.16.141
cluster_change_hist.txt@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.6.1.19
mysql-test/ndb/ndb_config_1_node.ini@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.4.1.3
mysql-test/ndb/ndb_config_2_node.ini@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.21.1.4
storage/ndb/include/mgmapi/mgmapi_config_parameters.h@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.31.2.3
storage/ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.63.1.2
storage/ndb/src/kernel/blocks/backup/Backup.hpp@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.28.1.1
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.57.2.7
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.134.2.18
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.44.2.8
storage/ndb/src/kernel/blocks/restore.cpp@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.13.1.2
storage/ndb/src/kernel/vm/Configuration.cpp@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.57.1.1
storage/ndb/src/kernel/vm/Configuration.hpp@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.23.1.1
storage/ndb/src/kernel/vm/SimulatedBlock.hpp@stripped, 2007-06-09 07:25:43+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.30.1.1
storage/ndb/src/kernel/vm/WatchDog.cpp@stripped, 2007-06-09 07:25:44+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.7.1.3
storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-06-09 07:25:44+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.97.2.4
storage/ndb/src/ndbapi/ndberror.c@stripped, 2007-06-09 07:25:44+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.81.2.6
storage/ndb/tools/restore/Restore.cpp@stripped, 2007-06-09 07:25:44+02:00, tomas@stripped +0 -0
Auto merged
MERGE: 1.44.1.3
# 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/RESYNC
--- 1.20/cluster_change_hist.txt 2007-06-03 19:38:56 +02:00
+++ 1.21/cluster_change_hist.txt 2007-06-09 07:25:43 +02:00
@@ -2,9 +2,13 @@
mysql-5.1.15-ndb-6.1.X
==================================================
-mysql-5.1.15-ndb-6.1.11 ()
+mysql-5.1.15-ndb-6.1.11 (2007-05-06)
+ Bug #28751 Lots of memory locked in memory causes high kswapd
+ Bug #28899 not possible to set separate watchdog timeout at startup
+ Bug #28726 LCP files not removed after initial system restart
Bug #20612 failed ndbrequire in PGMAN
+ make size of redo log files (fragment log files) configurable (error 1220)
mysql-5.1.15-ndb-6.1.10 (2007-05-30)
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2522) | tomas | 9 Jun |
