Commit b8fdd56a authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix conversion warnings/errors.

parent 7a4f81b4
...@@ -3319,7 +3319,7 @@ class Field_blob :public Field_longstr { ...@@ -3319,7 +3319,7 @@ class Field_blob :public Field_longstr {
{ {
store_length(ptr, packlength, number); store_length(ptr, packlength, number);
} }
inline uint32 get_length(uint row_offset= 0) const inline uint32 get_length(my_ptrdiff_t row_offset= 0) const
{ return get_length(ptr+row_offset, this->packlength); } { return get_length(ptr+row_offset, this->packlength); }
uint32 get_length(const uchar *ptr, uint packlength) const; uint32 get_length(const uchar *ptr, uint packlength) const;
uint32 get_length(const uchar *ptr_arg) const uint32 get_length(const uchar *ptr_arg) const
......
...@@ -208,7 +208,7 @@ void mdev10259() ...@@ -208,7 +208,7 @@ void mdev10259()
res= my_b_flush_io_cache(&info, 1); res= my_b_flush_io_cache(&info, 1);
ok(res == 0, "flush" INFO_TAIL); ok(res == 0, "flush" INFO_TAIL);
ulong saved_pos= my_b_tell(&info); my_off_t saved_pos= my_b_tell(&info);
res= reinit_io_cache(&info, READ_CACHE, 0, 0, 0); res= reinit_io_cache(&info, READ_CACHE, 0, 0, 0);
ok(res == 0, "reinit READ_CACHE" INFO_TAIL); ok(res == 0, "reinit READ_CACHE" INFO_TAIL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment