List:Commits« Previous MessageNext Message »
From:Aditya A Date:March 7 2013 9:23am
Subject:bzr push into mysql-5.6 branch (aditya.a:4869 to 4870) Bug#16069598
View as plain text  
 4870 Aditya A	2013-03-07 [merge]
      BUG#16069598 - SERVER CRASH BY NULL POINTER DEREFERENCING 
                     IN MEM_HEAP_CREATE_BLOCK()
      
      [ Merge from 5.5 ]

    modified:
      storage/innobase/mem/mem0mem.cc
 4869 Tor Didriksen	2013-03-07 [merge]
      merge 5.5 => 5.6

    modified:
      cmake/package_name.cmake
=== modified file 'storage/innobase/mem/mem0mem.cc'
--- a/storage/innobase/mem/mem0mem.cc	revid:tor.didriksen@stripped
+++ b/storage/innobase/mem/mem0mem.cc	revid:aditya.a@stripped
@@ -354,7 +354,11 @@ mem_heap_create_block(
 		block = (mem_block_t*) buf_block->frame;
 	}
 
-	ut_ad(block);
+	if(!block) {
+		ib_logf(IB_LOG_LEVEL_FATAL,
+			" InnoDB: Unable to allocate memory of size %lu.\n",
+			len);
+	}
 	block->buf_block = buf_block;
 	block->free_block = NULL;
 #else /* !UNIV_HOTBACKUP */

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6 branch (aditya.a:4869 to 4870) Bug#16069598Aditya A3 Apr