database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix conversion warnings/errors.

Browse Source
This commit is contained in:
Vladislav Vaintroub
2018-05-24 20:11:52 +00:00
parent 7a4f81b4c0
commit b8fdd56a4d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.h
View File

@ -3319,7 +3319,7 @@ public:
{ {
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

2
unittest/sql/mf_iocache-t.cc
View File

@ -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);