diff options
| author | monty@narttu.mysql.fi <> | 2003-06-12 22:39:45 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-06-12 22:39:45 +0300 |
| commit | ecdb1c768ca856c8eef5389f02a2879c17688b21 (patch) | |
| tree | 0be61ddbb8a76073cf672a53d8a43bbb00c751eb /include | |
| parent | a79bdf2ee75fa48b34cd4736b49ea91197afaeae (diff) | |
| download | mariadb-git-ecdb1c768ca856c8eef5389f02a2879c17688b21.tar.gz | |
Changed safemalloc structure to not have to be 8 byte aligned. (Portability problem)
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 603b3bad6bd..7f8b8a80a1c 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -138,7 +138,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #define QUICK_SAFEMALLOC sf_malloc_quick=1 #define NORMAL_SAFEMALLOC sf_malloc_quick=0 extern uint sf_malloc_prehunc,sf_malloc_endhunc,sf_malloc_quick; -extern ulonglong safemalloc_mem_limit; +extern ulonglong sf_malloc_mem_limit; #define CALLER_INFO_PROTO , const char *sFile, uint uLine #define CALLER_INFO , __FILE__, __LINE__ @@ -239,7 +239,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 long lCurMemory,lMaxMemory; /* from safemalloc */ +extern ulong 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, |