Skip to content

M
mariadb
Commit 65831bca authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files
Options

MDEV-4203 : fix maria SE repair functions (wrong operator precedence)

parent b3ad9de0
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
storage/maria/ma_check.c
View file @ 65831bca
...@@ -3960,8 +3960,8 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info, ...@@ -3960,8 +3960,8 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info,
if (rep_quick && (param->testflag & T_FORCE_UNIQUENESS)) if (rep_quick && (param->testflag & T_FORCE_UNIQUENESS))
{ {
my_off_t skr= (share->state.state.data_file_length + my_off_t skr= share->state.state.data_file_length +
(sort_info.org_data_file_type == COMPRESSED_RECORD) ? ((sort_info.org_data_file_type == COMPRESSED_RECORD) ?
MEMMAP_EXTRA_MARGIN : 0); MEMMAP_EXTRA_MARGIN : 0);
#ifdef USE_RELOC #ifdef USE_RELOC
if (sort_info.org_data_file_type == STATIC_RECORD && if (sort_info.org_data_file_type == STATIC_RECORD &&
...@@ -4482,8 +4482,8 @@ int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info, ...@@ -4482,8 +4482,8 @@ int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info,
if (rep_quick && (param->testflag & T_FORCE_UNIQUENESS)) if (rep_quick && (param->testflag & T_FORCE_UNIQUENESS))
{ {
my_off_t skr= (share->state.state.data_file_length + my_off_t skr= share->state.state.data_file_length +
(sort_info.org_data_file_type == COMPRESSED_RECORD) ? ((sort_info.org_data_file_type == COMPRESSED_RECORD) ?
MEMMAP_EXTRA_MARGIN : 0); MEMMAP_EXTRA_MARGIN : 0);
#ifdef USE_RELOC #ifdef USE_RELOC
if (sort_info.org_data_file_type == STATIC_RECORD && if (sort_info.org_data_file_type == STATIC_RECORD &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7