diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-09-14 00:35:42 +0400 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-09-14 00:35:42 +0400 |
| commit | 66434a6c6a2a9d58f039370a0534604414756011 (patch) | |
| tree | 206d6a2b5a8c076b54c3626df92fde175dfe1dfe /include | |
| parent | edb9559fd080ce1292b800eacf0d59d22fb6893e (diff) | |
| download | mariadb-git-66434a6c6a2a9d58f039370a0534604414756011.tar.gz | |
Two small fixes to make -debug version usable again.
include/my_sys.h:
Temporaly reverting Monty's optimization of clear_alloc_root() since it makes -debug server
unusable.
sql/sql_select.cc:
After merge fix. Now deletion is done outside of handle_select().
(We fixed the same issue with deletion of LEX::result in 4.1 for prepared statements
but in more general way).
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 38f1ca1cad4..cc40b7a7693 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -738,7 +738,7 @@ 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) { (A)->free= (A)->used= (A)->pre_alloc= 0; } +#define clear_alloc_root(A) bzero((void *) (A), sizeof(MEM_ROOT)) 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); |