diff options
Diffstat (limited to 'storage/maria/ma_delete.c')
| -rw-r--r-- | storage/maria/ma_delete.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/maria/ma_delete.c b/storage/maria/ma_delete.c index 22f7341098d..31773ef2dfc 100644 --- a/storage/maria/ma_delete.c +++ b/storage/maria/ma_delete.c @@ -988,7 +988,7 @@ static int underflow(MARIA_HA *info, MARIA_KEYDEF *keyinfo, */ if (_ma_log_add(anc_page, anc_length, keypos, anc_key_inserted.move_length + - max(anc_key_inserted.changed_length - + MY_MAX(anc_key_inserted.changed_length - anc_key_inserted.move_length, key_deleted.changed_length), anc_key_inserted.move_length - @@ -1230,7 +1230,7 @@ static int underflow(MARIA_HA *info, MARIA_KEYDEF *keyinfo, */ if (_ma_log_add(anc_page, anc_length, keypos, anc_key_inserted.move_length + - max(anc_key_inserted.changed_length - + MY_MAX(anc_key_inserted.changed_length - anc_key_inserted.move_length, key_deleted.changed_length), anc_key_inserted.move_length - @@ -1571,7 +1571,7 @@ my_bool _ma_log_delete(MARIA_PAGE *ma_page, const uchar *key_pos, current_size != share->max_index_block_size) { /* Append data that didn't fit on the page before */ - uint length= (min(ma_page->size, share->max_index_block_size) - + uint length= (MY_MIN(ma_page->size, share->max_index_block_size) - current_size); uchar *data= ma_page->buff + current_size; |