Commit 4b28798f authored by Jan Lindström's avatar Jan Lindström

Fix compiler error on x86.

parent 17430a80
...@@ -434,7 +434,7 @@ class IORequest { ...@@ -434,7 +434,7 @@ class IORequest {
dberr_t punch_hole( dberr_t punch_hole(
os_file_t fh, os_file_t fh,
os_offset_t offset, os_offset_t offset,
ulint len); os_offset_t len);
private: private:
/** Page to be written on write operation. */ /** Page to be written on write operation. */
......
...@@ -1887,7 +1887,10 @@ LinuxAIOHandler::collect() ...@@ -1887,7 +1887,10 @@ LinuxAIOHandler::collect()
&& slot->type.is_write() && slot->type.is_write()
&& slot->type.punch_hole()) { && slot->type.punch_hole()) {
slot->err = slot->type.punch_hole(slot->file, slot->offset, slot->len); slot->err = slot->type.punch_hole(
slot->file,
slot->offset,
static_cast<os_offset_t>(slot->len));
} else { } else {
slot->err = DB_SUCCESS; slot->err = DB_SUCCESS;
} }
...@@ -4825,8 +4828,8 @@ os_file_io( ...@@ -4825,8 +4828,8 @@ os_file_io(
&& type.is_write() && type.is_write()
&& type.punch_hole()) { && type.punch_hole()) {
*err = type.punch_hole(file, *err = type.punch_hole(file,
static_cast<ulint>(offset), offset,
n); static_cast<os_offset_t>(n));
} else { } else {
*err = DB_SUCCESS; *err = DB_SUCCESS;
...@@ -5494,7 +5497,7 @@ IORequest::punch_hole( ...@@ -5494,7 +5497,7 @@ IORequest::punch_hole(
return(DB_SUCCESS); return(DB_SUCCESS);
); );
ulint trim_len = get_trim_length(len); os_offset_t trim_len = static_cast<os_offset_t>(get_trim_length(len));
if (trim_len == 0) { if (trim_len == 0) {
return(DB_SUCCESS); return(DB_SUCCESS);
...@@ -5508,7 +5511,7 @@ IORequest::punch_hole( ...@@ -5508,7 +5511,7 @@ IORequest::punch_hole(
return DB_IO_NO_PUNCH_HOLE; return DB_IO_NO_PUNCH_HOLE;
} }
dberr_t err = os_file_punch_hole(fh, off, len); dberr_t err = os_file_punch_hole(fh, off, trim_len);
if (err == DB_SUCCESS) { if (err == DB_SUCCESS) {
srv_stats.page_compressed_trim_op.inc(); srv_stats.page_compressed_trim_op.inc();
......
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