mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
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:
commit
ab96882840
1 changed files with 1 additions and 1 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue