Fix conversion warnings/errors.

MariaDB · May 24, 2018 · b8fdd56 · b8fdd56
1 parent 7a4f81b
commit b8fdd56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sql/field.h b/sql/field.h
@@ -3319,7 +3319,7 @@ class Field_blob :public Field_longstr {
   {
     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); }
   uint32 get_length(const uchar *ptr, uint packlength) const;
   uint32 get_length(const uchar *ptr_arg) const

diff --git a/unittest/sql/mf_iocache-t.cc b/unittest/sql/mf_iocache-t.cc
@@ -208,7 +208,7 @@ void mdev10259()
   res= my_b_flush_io_cache(&info, 1);
   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);
   ok(res == 0, "reinit READ_CACHE" INFO_TAIL);