diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 17:34:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 17:34:49 +0300 |
| commit | a3539bbb2ac51dfa2b363d3b4c11784c25d1f256 (patch) | |
| tree | 6b49da1f15e5740adaf5da1c4179760a15b77dc4 /sql/field.h | |
| parent | c98e6d4b3d4d17ee429c696ac07e0bc4bbe1a81e (diff) | |
| parent | 6f96ff7268dd20d6d3b61931c972e7a43c1efdff (diff) | |
| download | mariadb-git-a3539bbb2ac51dfa2b363d3b4c11784c25d1f256.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 99da0cf624f..2079c90037a 100644 --- a/sql/field.h +++ b/sql/field.h @@ -3662,7 +3662,7 @@ public: DBUG_ASSERT(number < UINT_MAX32); store_length(ptr, packlength, (uint32)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 |