Commit f2ab9abb authored by Jan Lindström's avatar Jan Lindström

MDEV-9000: storage/xtradb/fil/fil0pagecompress.cc fails to compile on i686-linux

Incorrect parameter type was used. Fixed by casting data types to correct
ones.
parent 8a09280d
...@@ -277,7 +277,11 @@ fil_compress_page( ...@@ -277,7 +277,11 @@ fil_compress_page(
{ {
snappy_status cstatus; snappy_status cstatus;
cstatus = snappy_compress((const char *)buf, len, (char *)(out_buf+header_len), &write_size); cstatus = snappy_compress(
(const char *)buf,
(size_t)len,
(char *)(out_buf+header_len),
(size_t*)&write_size);
if (cstatus != SNAPPY_OK || write_size > UNIV_PAGE_SIZE-header_len) { if (cstatus != SNAPPY_OK || write_size > UNIV_PAGE_SIZE-header_len) {
if (space->printed_compression_failure == false) { if (space->printed_compression_failure == false) {
...@@ -645,9 +649,9 @@ fil_decompress_page( ...@@ -645,9 +649,9 @@ fil_decompress_page(
cstatus = snappy_uncompress( cstatus = snappy_uncompress(
(const char *)(buf+header_len), (const char *)(buf+header_len),
actual_size, (size_t)actual_size,
(char *)in_buf, (char *)in_buf,
&olen); (size_t*)&olen);
if (cstatus != SNAPPY_OK || (olen == 0 || olen > UNIV_PAGE_SIZE)) { if (cstatus != SNAPPY_OK || (olen == 0 || olen > UNIV_PAGE_SIZE)) {
ib_logf(IB_LOG_LEVEL_ERROR, ib_logf(IB_LOG_LEVEL_ERROR,
......
...@@ -277,7 +277,11 @@ fil_compress_page( ...@@ -277,7 +277,11 @@ fil_compress_page(
{ {
snappy_status cstatus; snappy_status cstatus;
cstatus = snappy_compress((const char *)buf, len, (char *)(out_buf+header_len), &write_size); cstatus = snappy_compress(
(const char *)buf,
(size_t)len,
(char *)(out_buf+header_len),
(size_t*)&write_size);
if (cstatus != SNAPPY_OK || write_size > UNIV_PAGE_SIZE-header_len) { if (cstatus != SNAPPY_OK || write_size > UNIV_PAGE_SIZE-header_len) {
if (space->printed_compression_failure == false) { if (space->printed_compression_failure == false) {
...@@ -644,9 +648,9 @@ fil_decompress_page( ...@@ -644,9 +648,9 @@ fil_decompress_page(
cstatus = snappy_uncompress( cstatus = snappy_uncompress(
(const char *)(buf+header_len), (const char *)(buf+header_len),
actual_size, (size_t)actual_size,
(char *)in_buf, (char *)in_buf,
&olen); (size_t*)&olen);
if (cstatus != SNAPPY_OK || (olen == 0 || olen > UNIV_PAGE_SIZE)) { if (cstatus != SNAPPY_OK || (olen == 0 || olen > UNIV_PAGE_SIZE)) {
ib_logf(IB_LOG_LEVEL_ERROR, ib_logf(IB_LOG_LEVEL_ERROR,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment