mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

5.2 -> 5.3

Browse source
This commit is contained in:
Sergei Golubchik 2013-02-28 21:48:47 +01:00
commit c4341d5095
115 changed files with 2397 additions and 1031 deletions
Download patch file Download diff file Expand all files Collapse all files

8
storage/maria/ma_check.c
View file

@ -4019,8 +4019,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 &&
@ -4541,8 +4541,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 &&