bk commit into 5.1 tree (jonas:1.2614)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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-08-24 20:15:34+02:00, jonas@stripped +2 -0
  ndb - backup optim
    merge + fix small limit bug

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2007-08-24 20:15:29+02:00, jonas@stripped +2 -4
    merge + fix limit bug

  storage/ndb/tools/restore/Restore.cpp@stripped, 2007-08-24 20:15:29+02:00, jonas@stripped +4 -2
    fix warnings

# 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:	jonas
# Host:	eel.hemma.oreland.se
# Root:	/home/jonas/src/62-backup

--- 1.72/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2007-06-26 22:41:16 +02:00
+++ 1.73/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2007-08-24 20:15:29 +02:00
@@ -3226,7 +3226,6 @@
     EXECUTE_DIRECT(DBDICT, GSN_BACKUP_FRAGMENT_REQ, signal, 2);
   }
 
-  TablePtr save = tabPtr;
   ptr.p->tables.next(tabPtr);
   
 next:
@@ -3372,8 +3371,7 @@
   else
   {
     // mask
-    tabPtr.p->maxRecordSize += 1 + (tmpTab.NoOfAttributes + 31) >> 5;
-    tabPtr.p->maxRecordSize += (2 * varsize + 3) / 4;
+    tabPtr.p->maxRecordSize += 1 + (tmpTab.NoOfAttributes + null + 31) >> 5;
   }
 
   return true;
@@ -3707,7 +3705,7 @@
    * Unpack data
    */
   op.attrSzTotal += dataLen;
-  ndbrequire(dataLen < op.maxRecordSize);
+  ndbrequire(dataLen <= op.maxRecordSize);
 
   const Uint32 * src = &signal->theData[3];
   Uint32 * dst = op.dst;

--- 1.58/storage/ndb/tools/restore/Restore.cpp	2007-06-26 22:41:16 +02:00
+++ 1.59/storage/ndb/tools/restore/Restore.cpp	2007-08-24 20:15:29 +02:00
@@ -549,7 +549,7 @@
 RestoreDataIterator::init_bitfield_storage(const NdbDictionary::Table* tab, Uint32 p)
 {
   Uint32 len = 0;
-  for (Uint32 i = 0; i<tab->getNoOfColumns(); i++)
+  for (Uint32 i = 0; i<(Uint32)tab->getNoOfColumns(); i++)
   {
     if (tab->getColumn(i)->getType() == NdbDictionary::Column::Bit)
     {
@@ -745,7 +745,7 @@
     const NdbDictionary::Table* tab = m_currentTable->m_dictTable;
 
     // All columns should be present...
-    assert(((tab->getNoOfColumns() + 31) >> 5) == bmlen32);
+    assert(Uint32((tab->getNoOfColumns() + 31) >> 5) == bmlen32);
 
     /**
      * Iterate through attributes...
@@ -786,6 +786,7 @@
 
       switch(align){
       case DictTabInfo::aBit: // Bit
+      { 
         src = pad(src, 0, 0);
         Uint32* src32 = (Uint32*)src;
 
@@ -812,6 +813,7 @@
 	src += 4 * ((bitPos + len) >> 5);
 	bitPos = (bitPos + len) & 31;
         goto next;
+      }
       default:
         src = pad(src, align, bitPos);
       }