bzr commit into mysql-5.1-telco-7.0 branch (msabaratnam:4233)

[Maitrayi Sabaratnam]

#At file:///export/home2/tmp/maitrayi/mysql-repo/repo-7.0/mysql-5.1-telco-7.0-53106/ based on revid:jonas@stripped

 4233 Maitrayi Sabaratnam	2011-02-24 [merge]
      Merge

    modified:
      storage/ndb/src/kernel/blocks/lgman.cpp
=== modified file 'storage/ndb/src/kernel/blocks/lgman.cpp'
--- a/storage/ndb/src/kernel/blocks/lgman.cpp	2011-02-17 15:51:08 +0000
+++ b/storage/ndb/src/kernel/blocks/lgman.cpp	2011-02-24 13:39:24 +0000
@@ -1207,19 +1207,15 @@ Lgman::alloc_logbuffer_memory(Ptr<Logfil
     }
   }
 
-  if(2*pages > requested)
+  if(pages)
   {
-    // less than half allocated
+    /* Could not allocate all of the requested memory.
+     * So release that already allocated.
+     */
     free_logbuffer_memory(ptr);
     return false;
   }
   
-  if(pages != 0)
-  {
-    warningEvent("Allocated %d pages for log buffer space, logfile_group: %d"
-		 " , requested %d pages", 
-		 (requested-pages), ptr.p->m_logfile_group_id, requested);
-  }
 #if defined VM_TRACE || defined ERROR_INSERT
   ndbout << "DD lgman: fg id:" << ptr.p->m_logfile_group_id << " undo buffer pages/bytes:" << (requested-pages) << "/" << (requested-pages)*File_formats::NDB_PAGE_SIZE << endl;
 #endif

No bundle (reason: revision is a merge).