database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge damien-katzs-computer.local:/Users/dkatz/50b

Browse Source 
into  damien-katzs-computer.local:/Users/dkatz/51merge


mysys/my_alloc.c:
  Auto merged
This commit is contained in:
unknown
2007-04-16 14:08:03 -04:00
parent 57969dfbd5 59250a68e2
commit db4639b4e4
3 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/my_alloc.c
View File

@ -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