diff options
| author | unknown <dkatz@damien-katzs-computer.local> | 2007-04-16 14:08:03 -0400 |
|---|---|---|
| committer | unknown <dkatz@damien-katzs-computer.local> | 2007-04-16 14:08:03 -0400 |
| commit | db4639b4e46f8872801cf1fc3af6bdcf416958ab (patch) | |
| tree | 5a3220b7546b3866a8a44d019d33da455297b2b7 /mysys | |
| parent | 57969dfbd5c223bb70c32e4462cbd2240abc3b8d (diff) | |
| parent | 59250a68e2bf4fecb07516df9df67a517664d085 (diff) | |
| download | mariadb-git-db4639b4e46f8872801cf1fc3af6bdcf416958ab.tar.gz | |
Merge damien-katzs-computer.local:/Users/dkatz/50b
into damien-katzs-computer.local:/Users/dkatz/51merge
mysys/my_alloc.c:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_alloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 5a0ac7b87f7..233abf793e0 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -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 |