summaryrefslogtreecommitdiff
path: root/storage/maria
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2013-02-26 21:20:15 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2013-02-26 21:20:15 +0100
commit65831bca6f516db383c1bc04884b65b9fa7b6926 (patch)
tree0caf78a4207f594852062d2f5968c4d10020ecae /storage/maria
parentb3ad9de0c07ae8839b65c7d379546721bb2bbe85 (diff)
downloadmariadb-git-65831bca6f516db383c1bc04884b65b9fa7b6926.tar.gz
MDEV-4203 : fix maria SE repair functions (wrong operator precedence)
Diffstat (limited to 'storage/maria')
-rw-r--r--storage/maria/ma_check.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index 9ce8e42cae0..b97e66da7ce 100644
--- a/storage/maria/ma_check.c
+++ b/storage/maria/ma_check.c
@@ -3960,8 +3960,8 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info,
if (rep_quick && (param->testflag & T_FORCE_UNIQUENESS))
{
- my_off_t skr= (share->state.state.data_file_length +
- (sort_info.org_data_file_type == COMPRESSED_RECORD) ?
+ my_off_t skr= share->state.state.data_file_length +
+ ((sort_info.org_data_file_type == COMPRESSED_RECORD) ?
MEMMAP_EXTRA_MARGIN : 0);
#ifdef USE_RELOC
if (sort_info.org_data_file_type == STATIC_RECORD &&
@@ -4482,8 +4482,8 @@ int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info,
if (rep_quick && (param->testflag & T_FORCE_UNIQUENESS))
{
- my_off_t skr= (share->state.state.data_file_length +
- (sort_info.org_data_file_type == COMPRESSED_RECORD) ?
+ my_off_t skr= share->state.state.data_file_length +
+ ((sort_info.org_data_file_type == COMPRESSED_RECORD) ?
MEMMAP_EXTRA_MARGIN : 0);
#ifdef USE_RELOC
if (sort_info.org_data_file_type == STATIC_RECORD &&