diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-05-24 20:11:52 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-05-24 20:11:52 +0000 |
| commit | b8fdd56a4d64d9bb02f2e3e9609af82e558cbcb5 (patch) | |
| tree | b80e56d6fa420146ba3bb942dcede05dfe1f4bb3 | |
| parent | 7a4f81b4c0d78e51c7b260b6f84e2732fbb99192 (diff) | |
| download | mariadb-git-b8fdd56a4d64d9bb02f2e3e9609af82e558cbcb5.tar.gz | |
Fix conversion warnings/errors.
| -rw-r--r-- | sql/field.h | 2 | ||||
| -rw-r--r-- | unittest/sql/mf_iocache-t.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 7074a636ff9..4bf92faecdd 100644 --- a/sql/field.h +++ b/sql/field.h @@ -3319,7 +3319,7 @@ public: { 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 index fb5577a7ab9..9f2e4b1b303 100644 --- 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); |