Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
This commit is contained in:
unknown 2008-04-08 09:20:53 +02:00
commit ab96882840

View file

@ -202,7 +202,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length)
{
if (mem_root->error_handler)
(*mem_root->error_handler)();
return((void*) 0); /* purecov: inspected */
DBUG_RETURN((void*) 0); /* purecov: inspected */
}
mem_root->block_num++;
next->next= *prev;