diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-06-11 11:41:46 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-06-11 11:41:46 +0300 |
| commit | e5403ec95a82002ff30b74fd8d556a1641426d31 (patch) | |
| tree | 51e98b9ca2a5d2b5bbd203c9f2b7026be34dd5a5 /storage | |
| parent | 6d8d6afb640225144f447acfcd41880b29358b39 (diff) | |
| download | mariadb-git-e5403ec95a82002ff30b74fd8d556a1641426d31.tar.gz | |
Fixed build failures with maria3.test and widows build
mysql-test/suite/maria/t/maria3.test:
Fix when compiling with safemalloc
storage/maria/ha_maria.cc:
Fix that MAX_FILE_SIZE is not limited on 32 bit machines.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/maria/ha_maria.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index c9d3cab3359..7e32d2fe3d8 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -40,7 +40,7 @@ SET(ARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c ha_maria.cc trnman.c lockman.c tablockman.c ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c ma_sp_key.c ma_control_file.c ma_loghandler.c - ma_pagecache.c ma_pagecaches.c compat_aliases.cc compat_aliases.h + ma_pagecache.c ma_pagecaches.c ma_checkpoint.c ma_recovery.c ma_commit.c ma_pagecrc.c ha_maria.h maria_def.h ma_recovery_util.c ma_servicethread.c ma_norec.c diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index aa51163f693..47c3e994ebb 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -212,7 +212,8 @@ static MYSQL_SYSVAR_ULONGLONG(max_sort_file_size, maria_max_temp_length, PLUGIN_VAR_RQCMDARG, "Don't use the fast sort index method to created index if the " "temporary file would get bigger than this.", - 0, 0, MAX_FILE_SIZE & ~(1*MB-1), 0, MAX_FILE_SIZE, 1*MB); + 0, 0, MAX_FILE_SIZE & ~((ulonglong) (1*MB-1)), + 0, MAX_FILE_SIZE, 1*MB); static MYSQL_SYSVAR_ULONG(pagecache_age_threshold, pagecache_age_threshold, PLUGIN_VAR_RQCMDARG, |