diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-04-18 14:50:32 -0600 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-04-18 14:50:32 -0600 |
| commit | 6ff11d70a82c293b8bfba594f0ca744736257c76 (patch) | |
| tree | 58740e92430fa18bd25f051d28dea0f953b33fca /mysys | |
| parent | 4eecb58fd65e77091c930f0a039a59e85d2c1b5d (diff) | |
| parent | ff2e7f450b00bf8814833f754fb624c3e239524f (diff) | |
| download | mariadb-git-6ff11d70a82c293b8bfba594f0ca744736257c76.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/50
into siva.hindu.god:/home/tsmith/m/bk/maint/50
mysys/my_alloc.c:
Auto merged
sql/mysqld.cc:
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 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 |