bk commit into 5.1 tree (tomas:1.2534)

[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-12 10:38:10+02:00, tomas@stripped +5 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
  MERGE: 1.2403.18.65

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2007-06-12 10:38:05+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.62.1.3

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-06-12 10:38:05+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.55.2.8

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@stripped, 2007-06-12 10:38:05+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.35.2.4

  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@stripped, 2007-06-12 10:38:05+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.10.1.3

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-06-12 10:38:05+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.96.2.4

# 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-new-ndb/RESYNC

--- 1.110/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-06-05 18:00:27 +02:00
+++ 1.111/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-06-12 10:38:05 +02:00
@@ -1322,6 +1322,18 @@
     STR_VALUE(MAX_INT_RNIL) },
 
   { 
+    CFG_DB_MAX_ALLOCATE,
+    "MaxAllocate",
+    DB_TOKEN,
+    "Maximum size of allocation to use when allocating memory for tables",
+    ConfigInfo::CI_USED,
+    false,
+    ConfigInfo::CI_INT,
+    "32M",
+    "1M",
+    "1G" },
+
+  { 
     CFG_DB_MEMREPORT_FREQUENCY,
     "MemReportFrequency",
     DB_TOKEN,

--- 1.66/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2007-06-05 18:00:25 +02:00
+++ 1.67/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2007-06-12 10:38:05 +02:00
@@ -448,6 +448,41 @@
 		  filePtr.p->m_flags);
       }
     }
+
+    ndbout_c("m_curr_disk_write_speed: %u  m_words_written_this_period: %u  m_overflow_disk_write: %u",
+              m_curr_disk_write_speed, m_words_written_this_period, m_overflow_disk_write);
+    ndbout_c("m_reset_delay_used: %u  m_reset_disk_speed_time: %llu",
+             m_reset_delay_used, (Uint64)m_reset_disk_speed_time);
+    for(c_backups.first(ptr); ptr.i != RNIL; c_backups.next(ptr))
+    {
+      ndbout_c("BackupRecord %u:  BackupId: %u  MasterRef: %x  ClientRef: %x",
+               ptr.i, ptr.p->backupId, ptr.p->masterRef, ptr.p->clientRef);
+      ndbout_c(" State: %u", ptr.p->slaveState.getState());
+      ndbout_c(" noOfByte: %llu  noOfRecords: %llu",
+               ptr.p->noOfBytes, ptr.p->noOfRecords);
+      ndbout_c(" noOfLogBytes: %llu  noOfLogRecords: %llu",
+               ptr.p->noOfLogBytes, ptr.p->noOfLogRecords);
+      ndbout_c(" errorCode: %u", ptr.p->errorCode);
+      BackupFilePtr filePtr;
+      for(ptr.p->files.first(filePtr); filePtr.i != RNIL; 
+	  ptr.p->files.next(filePtr))
+      {
+	ndbout_c(" file %u:  type: %u  flags: H'%x  tableId: %u  fragmentId: %u",
+                 filePtr.i, filePtr.p->fileType, filePtr.p->m_flags,
+                 filePtr.p->tableId, filePtr.p->fragmentNo);
+      }
+      if (ptr.p->slaveState.getState() == SCANNING && ptr.p->dataFilePtr != RNIL)
+      {
+        c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
+        OperationRecord & op = filePtr.p->operation;
+        Uint32 *tmp = NULL;
+        Uint32 sz = 0;
+        bool eof = FALSE;
+        bool ready = op.dataBuffer.getReadPtr(&tmp, &sz, &eof);
+        ndbout_c("ready: %s  eof: %s", ready ? "TRUE" : "FALSE", eof ? "TRUE" : "FALSE");
+      }
+    }
+    return;
   }
   if(signal->theData[0] == 24){
     /**

--- 1.70/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-05-14 10:39:42 +02:00
+++ 1.71/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2007-06-12 10:38:05 +02:00
@@ -2700,6 +2700,7 @@
 
   ArrayPool<Page> c_page_pool;
   Uint32 cnoOfAllocatedPages;
+  Uint32 m_max_allocate_pages;
   
   Tablerec *tablerec;
   Uint32 cnoOfTablerec;

--- 1.43/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2007-05-14 10:39:42 +02:00
+++ 1.44/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2007-06-12 10:38:05 +02:00
@@ -305,6 +305,12 @@
   Uint32 noOfTriggers= 0;
   
   Uint32 tmp= 0;
+
+  if (ndb_mgm_get_int_parameter(p, CFG_DB_MAX_ALLOCATE, &tmp))
+    tmp = 32 * 1024 * 1024;
+  m_max_allocate_pages = (tmp + GLOBAL_PAGE_SIZE - 1) / GLOBAL_PAGE_SIZE;
+
+  tmp = 0;
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUP_PAGE_RANGE, &tmp));
   initPageRangeSize(tmp);
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_TUP_TABLE, &cnoOfTablerec));

--- 1.14/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2007-04-26 13:45:26 +02:00
+++ 1.15/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2007-06-12 10:38:05 +02:00
@@ -432,6 +432,11 @@
 // We will grow by 18.75% plus two more additional pages to grow
 // a little bit quicker in the beginning.
 /* -----------------------------------------------------------------*/
+
+  if (noAllocPages > m_max_allocate_pages)
+  {
+    noAllocPages = m_max_allocate_pages;
+  }
   Uint32 allocated = allocFragPages(regFragPtr, noAllocPages);
   regFragPtr->noOfPagesToGrow += allocated;
 }//Dbtup::allocMoreFragPages()