diff options
| author | monty@mishka.local <> | 2004-10-14 18:06:38 +0300 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-10-14 18:06:38 +0300 |
| commit | 57a85986ac46550dcf7ced4cb50111efe2a6e0ad (patch) | |
| tree | 9616b70a88df88c50dde750a5d3caa05d5759819 /include | |
| parent | 3aaae0e390ffe1fae4560a395afb40ea78282e1f (diff) | |
| parent | 719c88e38fd772efd3f13096380d57f282dfd649 (diff) | |
| download | mariadb-git-57a85986ac46550dcf7ced4cb50111efe2a6e0ad.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 271e0ea0bcb..01a7482e4d0 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -726,7 +726,7 @@ extern void my_free_lock(byte *ptr,myf flags); #endif #define alloc_root_inited(A) ((A)->min_malloc != 0) #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) +#define clear_alloc_root(A) do { (A)->free= (A)->used= (A)->pre_alloc= 0; (A)->min_malloc=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); |