diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 14:38:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 14:38:07 +0300 |
| commit | d5bcccdabbf1a23c75ab4ee0c14149eb6ed27d98 (patch) | |
| tree | 865185f97a83236859ac4969b4e08fa68967b849 | |
| parent | e4a7c15dd6ba812ac9a4183dec937513eb68a2bc (diff) | |
| parent | fbb1e92e2553cbc98fbbbe23399f2a4342de41fd (diff) | |
| download | mariadb-git-d5bcccdabbf1a23c75ab4ee0c14149eb6ed27d98.tar.gz | |
Merge 10.2 into 10.3
| -rw-r--r-- | storage/innobase/unittest/innodb_fts-t.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/unittest/innodb_fts-t.cc b/storage/innobase/unittest/innodb_fts-t.cc index 57585e337c2..4e10c0e439e 100644 --- a/storage/innobase/unittest/innodb_fts-t.cc +++ b/storage/innobase/unittest/innodb_fts-t.cc @@ -5,7 +5,7 @@ struct fts_encode_info { const byte buf[10]; - int32_t len; + size_t len; doc_id_t val; }; @@ -40,7 +40,7 @@ int main(int, char**) { byte buf[10]; const byte* fts_buf= buf; - int32_t len= fts_encode_int(fts_info[i].val, buf) - &buf[0]; + size_t len= fts_encode_int(fts_info[i].val, buf) - &buf[0]; if (fts_info[i].len == len && !memcmp(&fts_info[i].buf, buf, len) && fts_decode_vlc(&fts_buf) == fts_info[i].val && |