diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
| commit | 2c1067166d7e8a9541578220b408f1e553e23916 (patch) | |
| tree | 2ba0932f92d88e01d51393de63dda842f6daf320 /storage/archive | |
| parent | 2cf3e2ea2fca3d3613309de94d55c88dedb3831a (diff) | |
| parent | 61b2618d3aae78950f1b8dbe8d4482573c77875d (diff) | |
| download | mariadb-git-2c1067166d7e8a9541578220b408f1e553e23916.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 15c5c6a603e..e478058c7fd 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -410,7 +410,7 @@ unsigned int ha_archive::pack_row_v1(uchar *record) pos+= length; } } - DBUG_RETURN(pos - record_buffer->buffer); + DBUG_RETURN((int)(pos - record_buffer->buffer)); } /* |