diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2008-08-20 06:45:56 +0400 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2008-08-20 06:45:56 +0400 |
| commit | aa04f75384d22bbdf83544a41a2648f16f87827e (patch) | |
| tree | 0036352766c586952bafd75ea6d0cf5783ab70af /include/my_sys.h | |
| parent | d1e57a0fbdd382f602106e644db01cfe24ddf151 (diff) | |
| download | mariadb-git-aa04f75384d22bbdf83544a41a2648f16f87827e.tar.gz | |
Fix merge problem: make sf_malloc_cur_memory definitions match in headers and source
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 7e6a51ff21f..315d2f5c08d 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -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, |