diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 08:45:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 18:04:02 +0300 |
| commit | 47141c9d9b5170bb8e6a401f4456a4d759688fe3 (patch) | |
| tree | d01797ed9c169f15a3545c9a846e383c25c746cb /storage/innobase/fil/fil0pagecompress.cc | |
| parent | 5684aa220cc4415fe8ee31ac044210b9ff8c7ce1 (diff) | |
| download | mariadb-git-47141c9d9b5170bb8e6a401f4456a4d759688fe3.tar.gz | |
Fix some InnoDB type mismatch
On 64-bit Windows, sizeof(ulint)!=sizeof(ulong).
Diffstat (limited to 'storage/innobase/fil/fil0pagecompress.cc')
| -rw-r--r-- | storage/innobase/fil/fil0pagecompress.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/fil/fil0pagecompress.cc b/storage/innobase/fil/fil0pagecompress.cc index e9a9a0c59a0..dad74ce34f2 100644 --- a/storage/innobase/fil/fil0pagecompress.cc +++ b/storage/innobase/fil/fil0pagecompress.cc @@ -253,7 +253,8 @@ fil_compress_page( #endif /* HAVE_SNAPPY */ case PAGE_ZLIB_ALGORITHM: - err = compress2(out_buf+header_len, (ulong*)&write_size, buf, len, comp_level); + err = compress2(out_buf+header_len, (ulong*)&write_size, buf, + uLong(len), comp_level); if (err != Z_OK) { goto err_exit; @@ -308,7 +309,7 @@ fil_compress_page( bool tsfound; const page_size_t page_size = fil_space_get_page_size(space_id, &tsfound); - fil_decompress_page(uncomp_page, comp_page, len, NULL); + fil_decompress_page(uncomp_page, comp_page, ulong(len), NULL); if (buf_page_is_corrupted(false, uncomp_page, page_size, space)) { buf_page_print(uncomp_page, page_size, 0); |