← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_static.c

Merged in changes. 
Edited a the comment test case so deal with our version bump.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_static.c
56
56
USED_MEM* my_once_root_block=0;                 /* pointer to first block */
57
57
uint      my_once_extra=ONCE_ALLOC_INIT;        /* Memory to alloc / block */
58
58
 
59
 
        /* from my_largepage.c */
60
 
#ifdef HAVE_LARGE_PAGES
61
 
my_bool my_use_large_pages= 0;
62
 
uint    my_large_page_size= 0;
63
 
#endif
64
 
 
65
59
        /* from safe_malloc */
66
60
uint sf_malloc_prehunc=0,               /* If you have problem with core- */
67
61
     sf_malloc_endhunc=0,               /* dump when malloc-message.... */