diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
| commit | 993ea79f2df42292eceeee394e8ece9f4a3f6cf2 (patch) | |
| tree | d105c8288a89a25d412e9006b740c756db6326d6 /storage/maria | |
| parent | 1827d9591e24ee469527021771088d842ab18374 (diff) | |
| parent | 6599fd3e9c23a8957a63146cbe6a0ffc4c292a3d (diff) | |
| download | mariadb-git-993ea79f2df42292eceeee394e8ece9f4a3f6cf2.tar.gz | |
5.5 merge
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ha_maria.h | 1 | ||||
| -rw-r--r-- | storage/maria/ma_check.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index 36a6d36a45c..6240895ee97 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; diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c index ab9080c40fb..192e2ed32a1 100644 --- a/storage/maria/ma_check.c +++ b/storage/maria/ma_check.c @@ -4025,8 +4025,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 && @@ -4545,8 +4545,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 && |