mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge damien-katzs-computer.local:/Users/dkatz/50b
into damien-katzs-computer.local:/Users/dkatz/51merge
This commit is contained in:
@ -133,6 +133,10 @@ void reset_root_defaults(MEM_ROOT *mem_root, uint block_size,
|
||||
mem->next= *prev;
|
||||
*prev= mem_root->pre_alloc= mem;
|
||||
}
|
||||
else
|
||||
{
|
||||
mem_root->pre_alloc= 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user