diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /storage/maria/ma_write.c | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'storage/maria/ma_write.c')
| -rw-r--r-- | storage/maria/ma_write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c index 5d440a40dc0..24a3f96f42e 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -933,7 +933,7 @@ ChangeSet@1.2562, 2008-04-09 07:41:40+02:00, serg@janus.mylan +9 -0 &s_temp)); } DBUG_RETURN(_ma_split_page(info, key, anc_page, - min(org_anc_length, + MY_MIN(org_anc_length, info->s->max_index_block_size), key_pos, s_temp.changed_length, t_length, key_buff, insert_last)); @@ -2075,7 +2075,7 @@ static my_bool _ma_log_split(MARIA_PAGE *ma_page, Handle case when split happened directly after the newly inserted key. */ max_key_length= new_length - offset; - extra_length= min(key_length, max_key_length); + extra_length= MY_MIN(key_length, max_key_length); if (offset + move_length > new_length) { /* This is true when move_length includes changes for next packed key */ |