Merged 5.1 with maria 5.1

1 files changed, 2 insertions, 2 deletions

diff --git a/include/my_alloc.h b/include/my_alloc.h
index 02500865f80..6ade4d08980 100644
--- a/include/my_alloc.h
+++ b/include/my_alloc.h
@@ -39,12 +39,12 @@ typedef struct st_mem_root
   /* if block have less memory it will be put in 'used' list */
   size_t min_malloc;
   size_t block_size;               /* initial block size */
-  unsigned long block_num;         /* allocated blocks counter */
+  unsigned int block_num;          /* allocated blocks counter */
   /* 
      first free block in queue test counter (if it exceed 
      MAX_BLOCK_USAGE_BEFORE_DROP block will be dropped in 'used' list)
   */
-  unsigned long first_block_usage;
+  unsigned int first_block_usage;
 
   void (*error_handler)(void);
 } MEM_ROOT;