bk commit into 5.1 tree (tomas:1.2515)

[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-05-30 20:29:14+02:00, tomas@stripped +19 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/telco-6.1
  into  whalegate.ndb.mysql.com:/home/tomas/telco-6.2
  MERGE: 1.2403.16.134

  cluster_change_hist.txt@stripped, 2007-05-30 20:27:23+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.17

  configure.in@stripped, 2007-05-30 20:28:35+02:00, tomas@stripped +0 -2
    null merge
    MERGE: 1.420.8.9

  storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile@stripped, 2007-05-30 20:27:23+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.1

  storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp@stripped, 2007-05-30 20:27:23+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.2

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2007-05-30 20:27:23+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.42.2.5

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2007-05-30 20:27:23+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.114.1.4

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-05-30 20:27:23+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.101.1.14

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@stripped, 2007-05-30 20:27:23+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.57.2.5

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-05-30 20:27:24+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.134.2.16

  storage/ndb/src/kernel/blocks/dblqh/Makefile.am@stripped, 2007-05-30 20:27:24+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.9.1.2

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp@stripped, 2007-05-30 20:27:24+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.9.1.4

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@stripped, 2007-05-30 20:27:24+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.22.1.3

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2007-05-30 20:27:24+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.18.1.6

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2007-05-30 20:27:24+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.44.2.5

  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp@stripped, 2007-05-30 20:29:11+02:00, tomas@stripped +0 -0
    SCCS merged
    MERGE: 1.32.2.1

  storage/ndb/src/kernel/blocks/pgman.cpp@stripped, 2007-05-30 20:27:23+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.21.1.3

  storage/ndb/src/kernel/vm/WatchDog.cpp@stripped, 2007-05-30 20:27:24+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.7.1.2

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-05-30 20:27:24+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.40.1.10

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-05-30 20:27:24+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.66.1.14

# 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/telco-6.2/RESYNC

--- 1.18/cluster_change_hist.txt	2007-05-23 08:09:53 +02:00
+++ 1.19/cluster_change_hist.txt	2007-05-30 20:27:23 +02:00
@@ -2,7 +2,17 @@
 mysql-5.1.15-ndb-6.1.X
 ==================================================
 
-mysql-5.1.15-ndb-6.1.9 ()
+mysql-5.1.15-ndb-6.1.10 (2007-05-30)
+
+  Bug #28770 file already opened error when corrupt schema file
+  Bug #28717 Race between NODE_FAILREP and COPY_GCIREQ
+  Bug #28525 Node failures in PGMAN at ndbrequire (line 430)
+  Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire
+  Bug #28749 MaxNoOfOpenFiles offset by 1
+  Added addditional 'times' printout in ndbd WatchDog thread
+  Some filename changes to avoid 'tar' issues with 99 char limit
+
+mysql-5.1.15-ndb-6.1.9 (2007-05-24)
 
   Bug #28593 cluster backup scans in acc index order, bad for disk data
   Bug #28443 transporter gets stuck when >1024 signals received at once

--- 1.26/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2007-05-23 08:09:54 +02:00
+++ 1.27/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2007-05-30 20:27:24 +02:00
@@ -528,7 +528,9 @@
       }
 #endif
       
+#ifdef VM_TRACE
       ndbout << "allocated " << pages << " pages: " << ext.p->m_key << endl;
+#endif
       ext.p->m_first_page_no = ext.p->m_key.m_page_no;
       bzero(ext.p->m_free_page_count, sizeof(ext.p->m_free_page_count));
       ext.p->m_free_space= alloc.m_page_free_bits_map[0] * pages; 
@@ -1673,9 +1675,9 @@
       
       Ptr<Extent_info> ext;
       ndbrequire(c_extent_pool.seize(ext));
-      
+#ifdef VM_TRACE
       ndbout << "allocated " << pages << " pages: " << *key << endl;
-      
+#endif      
       ext.p->m_key = *key;
       ext.p->m_first_page_no = ext.p->m_key.m_page_no;
       ext.p->m_free_space= 0;