diff options
Diffstat (limited to 'sql/uniques.cc')
| -rw-r--r-- | sql/uniques.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/uniques.cc b/sql/uniques.cc index 86d8d6c7050..00112d714c7 100644 --- a/sql/uniques.cc +++ b/sql/uniques.cc @@ -525,7 +525,7 @@ static bool merge_walk(uchar *merge_buffer, size_t merge_buffer_size, top->base= merge_buffer + (top - begin) * piece_size; top->max_keys= max_key_count_per_piece; bytes_read= read_to_buffer(file, top, key_length); - if (bytes_read == (uint) (-1)) + if (unlikely(bytes_read == (uint) (-1))) goto end; DBUG_ASSERT(bytes_read); queue_insert(&queue, (uchar *) top); @@ -554,7 +554,7 @@ static bool merge_walk(uchar *merge_buffer, size_t merge_buffer_size, memcpy(save_key_buff, old_key, key_length); old_key= save_key_buff; bytes_read= read_to_buffer(file, top, key_length); - if (bytes_read == (uint) (-1)) + if (unlikely(bytes_read == (uint) (-1))) goto end; else if (bytes_read > 0) /* top->key, top->mem_count are reset */ queue_replace_top(&queue); /* in read_to_buffer */ @@ -602,7 +602,7 @@ static bool merge_walk(uchar *merge_buffer, size_t merge_buffer_size, } while (--top->mem_count); bytes_read= read_to_buffer(file, top, key_length); - if (bytes_read == (uint) (-1)) + if (unlikely(bytes_read == (uint) (-1))) goto end; } while (bytes_read); |