diff options
| author | unknown <dlenev@mysql.com> | 2004-09-23 13:52:00 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-09-23 13:52:00 +0400 |
| commit | 412a052a7dfa454de8f54499beb5cb2a5d56f06d (patch) | |
| tree | df8e7ee6040b348bdba7d2e245e594507926aa05 /include | |
| parent | ccf52b4fd5bd7ae0a418d22f2758cef345b6afa6 (diff) | |
| parent | 7ba5d931eb6611a1b3794d3c4378381060ac925d (diff) | |
| download | mariadb-git-412a052a7dfa454de8f54499beb5cb2a5d56f06d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-memroot
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index ad1966ba67f..271e0ea0bcb 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -725,7 +725,8 @@ extern void my_free_lock(byte *ptr,myf flags); #define my_free_lock(A,B) my_free((A),(B)) #endif #define alloc_root_inited(A) ((A)->min_malloc != 0) -#define clear_alloc_root(A) bzero((void *) (A), sizeof(MEM_ROOT)) +#define ALLOC_ROOT_MIN_BLOCK_SIZE (MALLOC_OVERHEAD + sizeof(USED_MEM) + 8) +#define clear_alloc_root(A) do { (A)->free= (A)->used= (A)->pre_alloc= 0; } while(0) extern void init_alloc_root(MEM_ROOT *mem_root, uint block_size, uint pre_alloc_size); extern gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size); |