Merge perch.ndb.mysql.com:/home/jonas/src/50-ndb

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb

storage/ndb/src/kernel/blocks/backup/Backup.cpp

@@ -326,15 +326,17 @@ Backup::execCONTINUEB(Signal* signal)
     ptr.p->files.getPtr(filePtr, ptr.p->ctlFilePtr);
     FsBuffer & buf = filePtr.p->operation.dataBuffer;
     
-    if(buf.getFreeSize() + buf.getMinRead() < buf.getUsableSize()) {
+    if(buf.getFreeSize() < buf.getMaxWrite()) {
       jam();
       TablePtr tabPtr LINT_SET_PTR;
       c_tablePool.getPtr(tabPtr, Tdata2);
       
-      DEBUG_OUT("Backup - Buffer full - " << buf.getFreeSize()
-		<< " + " << buf.getMinRead()
-		<< " < " << buf.getUsableSize()
-		<< " - tableId = " << tabPtr.p->tableId);
+      DEBUG_OUT("Backup - Buffer full - " 
+                << buf.getFreeSize()
+		<< " < " << buf.getMaxWrite()
+                << " (sz: " << buf.getUsableSize()
+                << " getMinRead: " << buf.getMinRead()
+		<< ") - tableId = " << tabPtr.p->tableId);
       
       signal->theData[0] = BackupContinueB::BUFFER_FULL_META;
       signal->theData[1] = Tdata1;

storage/ndb/src/kernel/blocks/backup/Backup.hpp

@@ -558,7 +558,7 @@ public:
   static const int  DISK_SPEED_CHECK_DELAY = 100;
   
   STATIC_CONST(NO_OF_PAGES_META_FILE = 
-               (MAX_WORDS_META_FILE + BACKUP_WORDS_PER_PAGE - 1) /
+	       (2*MAX_WORDS_META_FILE + BACKUP_WORDS_PER_PAGE - 1) / 
 	       BACKUP_WORDS_PER_PAGE);
 
   /**

storage/ndb/src/kernel/vm/DLHashTable.hpp

@@ -46,8 +46,8 @@ public:
   /**
    * Seize element from pool - return i
    *
-   * Note must be either added using <b>add</b> or released 
-   * using <b>release</b>
+   * Note *must* be added using <b>add</b> (even before hash.release)
+   *             or be released using pool
    */
   bool seize(Ptr<T> &);
 
@@ -360,8 +360,15 @@ DLHashTableImpl<P, T, U>::remove(Ptr<T> & ptr)
   else 
   {
     const Uint32 hv = ptr.p->hashValue() & mask;  
+    if (hashValues[hv] == ptr.i)
+    {
       hashValues[hv] = next;
     }
+    else
+    {
+      // Will add assert in 5.1
+    }
+  }
   
   if(next != RNIL)
   {
@@ -386,8 +393,15 @@ DLHashTableImpl<P, T, U>::release(Ptr<T> & ptr)
   else 
   {
     const Uint32 hv = ptr.p->hashValue() & mask;  
+    if (hashValues[hv] == ptr.i)
+    {
       hashValues[hv] = next;
     }
+    else
+    {
+      // Will add assert in 5.1
+    }
+  }
   
   if(next != RNIL)
   {

storage/ndb/src/kernel/vm/DLHashTable2.hpp

@@ -42,8 +42,8 @@ public:
   /**
    * Seize element from pool - return i
    *
-   * Note must be either added using <b>add</b> or released 
-   * using <b>release</b>
+   * Note *must* be added using <b>add</b> (even before hash.release)
+   *             or be released using pool
    */
   bool seize(Ptr<T> &);
 
@@ -374,8 +374,15 @@ DLHashTable2<T, U>::remove(Ptr<T> & ptr){
     prevP->nextHash = next;
   } else {
     const Uint32 hv = ptr.p->hashValue() & mask;  
+    if (hashValues[hv] == ptr.i)
+    {
       hashValues[hv] = next;
     }
+    else
+    {
+      // Will add assert in 5.1
+    }
+  }
   
   if(next != RNIL){
     T * nextP = (T*)thePool.getPtr(next);       // cast
@@ -395,8 +402,15 @@ DLHashTable2<T, U>::release(Ptr<T> & ptr){
     prevP->nextHash = next;
   } else {
     const Uint32 hv = ptr.p->hashValue() & mask;  
+    if (hashValues[hv] == ptr.i)
+    {
       hashValues[hv] = next;
     }
+    else
+    {
+      // Will add assert in 5.1
+    }
+  }
   
   if(next != RNIL){
     T * nextP = (T*)thePool.getPtr(next);       // cast