diff options
| author | tsmith@siva.hindu.god <> | 2007-04-18 14:50:32 -0600 |
|---|---|---|
| committer | tsmith@siva.hindu.god <> | 2007-04-18 14:50:32 -0600 |
| commit | 39496731a20accc694260ff5d156b49914b5c24d (patch) | |
| tree | 58740e92430fa18bd25f051d28dea0f953b33fca /mysys | |
| parent | 82e4afb89f958eb86a991ff8194e28c38fec3df5 (diff) | |
| parent | 587cc24f7142bb641b60f2bcde17e0bc7c1597c3 (diff) | |
| download | mariadb-git-39496731a20accc694260ff5d156b49914b5c24d.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/50
into siva.hindu.god:/home/tsmith/m/bk/maint/50
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 cfa2dd6216d..5983a29a3e1 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 |