bk commit into 5.1 tree (tomas:1.2544)

[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 17:46:38+02:00, tomas@stripped +2 -0
     updated cluster change hist
      vm trace of printout

  cluster_change_hist.txt@stripped, 2007-05-30 17:46:36+02:00, tomas@stripped
+1 -0
    updated cluster change hist

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@stripped, 2007-05-30 17:46:36+02:00,
tomas@stripped +2 -0
    vm trace of printour

# 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.1

--- 1.22/cluster_change_hist.txt	2007-05-30 08:50:35 +02:00
+++ 1.23/cluster_change_hist.txt	2007-05-30 17:46:36 +02:00
@@ -4,6 +4,7 @@
 
 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

--- 1.23/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2007-05-22 17:53:53 +02:00
+++ 1.24/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2007-05-30 17:46:36 +02:00
@@ -529,7 +529,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;