Commit 4fd0709d authored by Sergey Petrunia's avatar Sergey Petrunia
Browse files

Fix merge problem: make sf_malloc_cur_memory definitions match in headers and source

parent 2f9c81bc

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ extern int NEAR my_umask, /* Default creation mask */ 
	   NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */

	   NEAR my_dont_interrupt;	/* call remember_intr when set */

extern my_bool NEAR mysys_uses_curses, my_use_symdir;

extern ulong sf_malloc_cur_memory, sf_malloc_max_memory;

extern size_t sf_malloc_cur_memory, sf_malloc_max_memory;



extern ulong	my_default_record_cache_size;

extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io,