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 17:43:35 +0300 |
| commit | aafaf05a47221e035039d75a8f62dbda2379d044 (patch) | |
| tree | bf1374ec9021bf42ca911c9c8aede20d8eb9c8ef /storage/xtradb/buf/buf0buf.cc | |
| parent | 7445ff84f487011c94f3645fcce6abacb6e6a912 (diff) | |
| download | mariadb-git-aafaf05a47221e035039d75a8f62dbda2379d044.tar.gz | |
Fix some InnoDB type mismatch introduced in 10.1
On 64-bit Windows, sizeof(ulint)!=sizeof(ulong).
Diffstat (limited to 'storage/xtradb/buf/buf0buf.cc')
| -rw-r--r-- | storage/xtradb/buf/buf0buf.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc index 3fe07800fd3..7f77f96c2fe 100644 --- a/storage/xtradb/buf/buf0buf.cc +++ b/storage/xtradb/buf/buf0buf.cc @@ -6429,9 +6429,9 @@ buf_page_decrypt_after_read( /* decompress using comp_buf to dst_frame */ fil_decompress_page(slot->comp_buf, - dst_frame, - size, - &bpage->write_size); + dst_frame, + ulong(size), + &bpage->write_size); /* Mark this slot as free */ slot->reserved = false; @@ -6483,13 +6483,10 @@ buf_page_decrypt_after_read( #endif /* decompress using comp_buf to dst_frame */ fil_decompress_page(slot->comp_buf, - dst_frame, - size, - &bpage->write_size); - -#ifdef UNIV_DEBUG - fil_page_type_validate(dst_frame); -#endif + dst_frame, + ulong(size), + &bpage->write_size); + ut_d(fil_page_type_validate(dst_frame)); } /* Mark this slot as free */ |