Merge bk-internal:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


include/my_sys.h:
  Auto merged

1 files changed, 1 insertions, 0 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 3e34e1a9ac3..41bd4ba5b2d 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -714,6 +714,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) 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);