From 65831bca6f516db383c1bc04884b65b9fa7b6926 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 26 Feb 2013 21:20:15 +0100 Subject: MDEV-4203 : fix maria SE repair functions (wrong operator precedence) --- storage/maria/ma_check.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'storage/maria') 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 && -- cgit v1.2.1 From 2d78ef1d3b16bf014a9a1dc79c2edac2378a0d5a Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Thu, 28 Feb 2013 08:42:05 +0200 Subject: Added support for --crash-script in mysqld_safe. Trivial cleanup scripts/mysqld_safe.sh: Added support for --crash-script. Don't remove socket file (not needed as server will re-create it if needed) Patch by Eric Bergen storage/maria/ha_maria.h: Removed not existing variable. --- storage/maria/ha_maria.h | 1 - 1 file changed, 1 deletion(-) (limited to 'storage/maria') diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index 545daca12fe..80762296395 100644 --- a/storage/maria/ha_maria.h +++ b/storage/maria/ha_maria.h @@ -35,7 +35,6 @@ C_MODE_START ICP_RESULT index_cond_func_maria(void *arg); C_MODE_END -extern ulong maria_sort_buffer_size; extern TYPELIB maria_recover_typelib; extern ulonglong maria_recover_options; -- cgit v1.2.1