From 019256c9fc857bb89b1ca2ccc232f5ae4a67b992 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 18 Feb 2011 23:31:01 +0100 Subject: Fix numerous warnings introduced in the last pushes on Windows --- sql/multi_range_read.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/multi_range_read.cc') diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index 3aeb75fd896..0c8b60b72ed 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -1127,8 +1127,8 @@ bool DsMrr_impl::setup_buffer_sharing(uint key_size_in_keybuf, if (bytes_for_rowids < (ptrdiff_t)rowid_buf_elem_size + 1) { - ptrdiff_t add= rowid_buf_elem_size + 1 - bytes_for_rowids; - bytes_for_rowids= rowid_buf_elem_size + 1; + ptrdiff_t add= (ptrdiff_t)(rowid_buf_elem_size + 1 - bytes_for_rowids); + bytes_for_rowids= (ptrdiff_t)rowid_buf_elem_size + 1; bytes_for_keys -= add; } @@ -1138,7 +1138,7 @@ bool DsMrr_impl::setup_buffer_sharing(uint key_size_in_keybuf, key_buffer->set_buffer_space(rowid_buffer_end, full_buf_end); if (!key_buffer->have_space_for(key_buff_elem_size) || - !rowid_buffer.have_space_for(rowid_buf_elem_size)) + !rowid_buffer.have_space_for((size_t)rowid_buf_elem_size)) return TRUE; /* Failed to provide minimum space for one of the buffers */ return FALSE; -- cgit v1.2.1