← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to include/my_alloc.h

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/my_alloc.h
26
26
typedef struct st_used_mem
27
27
{                                  /* struct for once_alloc (block) */
28
28
  struct st_used_mem *next;        /* Next block in use */
29
 
  unsigned int  left;              /* memory left in block  */
30
 
  unsigned int  size;              /* size of block */
 
29
  size_t left;                     /* memory left in block  */
 
30
  size_t size;                     /* size of block */
31
31
} USED_MEM;
32
32
 
33
33
 
39
39
  /* if block have less memory it will be put in 'used' list */
40
40
  size_t min_malloc;
41
41
  size_t block_size;               /* initial block size */
42
 
  unsigned int block_num;          /* allocated blocks counter */
 
42
  unsigned long block_num;         /* allocated blocks counter */
43
43
  /* 
44
44
     first free block in queue test counter (if it exceed 
45
45
     MAX_BLOCK_USAGE_BEFORE_DROP block will be dropped in 'used' list)
46
46
  */
47
 
  unsigned int first_block_usage;
 
47
  unsigned long first_block_usage;
48
48
 
49
49
  void (*error_handler)(void);
50
50
} MEM_ROOT;