diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-03-30 15:42:04 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-03-30 15:42:04 +0200 |
| commit | 7bb4fe0959605d2fb0f0c659af225b193a6b57e4 (patch) | |
| tree | 28e70c811ae94a840a876df66d20007bdf8bf243 /include | |
| parent | 150b0850b3e36f4bfb251added83d3b6c4ca5025 (diff) | |
| parent | f56ad8c82c9bf37196c4d4bd4305735a5da4ad76 (diff) | |
| download | mariadb-git-7bb4fe0959605d2fb0f0c659af225b193a6b57e4.tar.gz | |
Merge the main tree into 5.0-build
Diffstat (limited to 'include')
| -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 8031a6934fe..35c4eb5f2b1 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -250,7 +250,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, |