diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-12 22:40:08 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-12 22:40:08 +0300 |
| commit | f5fba553259def57df9716d968600fd4f8ae31f9 (patch) | |
| tree | da11dc181fe02d5ebbe7d564d407a5faa69f927c /include | |
| parent | 58fb175f24f6af97acb0be6e667d4dd418f88efd (diff) | |
| parent | dd2836c4c153566420efcdbe68173b29adcb24e5 (diff) | |
| download | mariadb-git-f5fba553259def57df9716d968600fd4f8ae31f9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
sql/sql_parse.cc:
Auto merged
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, |