diff options
| author | monty@mashka.mysql.fi <> | 2002-12-20 14:58:27 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-20 14:58:27 +0200 |
| commit | b5aa9ae0c768c92321e99939f5533bcce8382366 (patch) | |
| tree | 1cf172e757bfa6aca7ae5af20ed7b0c727016120 /mysys/my_alloc.c | |
| parent | e2e5d5986672928d6e01f2bb7815ec5a1bf7c374 (diff) | |
| download | mariadb-git-b5aa9ae0c768c92321e99939f5533bcce8382366.tar.gz | |
Changed thd variables max_join_size and select_limit to type ha_rows.
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
Diffstat (limited to 'mysys/my_alloc.c')
| -rw-r--r-- | mysys/my_alloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 1ab86476e41..4d3b0604984 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -25,12 +25,13 @@ void init_alloc_root(MEM_ROOT *mem_root, uint block_size, uint pre_alloc_size __attribute__((unused))) { - mem_root->free= mem_root->used= 0; + mem_root->free= mem_root->used= mem_root->pre_alloc= 0; mem_root->min_malloc= 32; mem_root->block_size= block_size-MALLOC_OVERHEAD-sizeof(USED_MEM)-8; mem_root->error_handler= 0; mem_root->block_num= 4; /* We shift this with >>2 */ mem_root->first_block_usage= 0; + #if !(defined(HAVE_purify) && defined(EXTRA_DEBUG)) if (pre_alloc_size) { @@ -137,6 +138,7 @@ static inline void mark_blocks_free(MEM_ROOT* root) /* Now everything is set; Indicate that nothing is used anymore */ root->used= 0; + root->first_block_usage= 0; } |