From 4e68fafad44fbb5ea57a3cf9a750690d88f6fe1c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 26 May 2014 20:42:06 +0200 Subject: [PATCH] compilation failure on Win64 cannot use &ulint_var (where ulint == unsigned __int64) where (ulong *) is expected (in uncompress() and in "%lu") --- storage/innobase/fil/fil0pagecompress.cc | 2 +- storage/innobase/include/fil0pagecompress.h | 2 +- storage/xtradb/fil/fil0pagecompress.cc | 2 +- storage/xtradb/include/fil0pagecompress.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/storage/innobase/fil/fil0pagecompress.cc b/storage/innobase/fil/fil0pagecompress.cc index 51f584883b5..bf6dd35e2f6 100644 --- a/storage/innobase/fil/fil0pagecompress.cc +++ b/storage/innobase/fil/fil0pagecompress.cc @@ -232,7 +232,7 @@ fil_decompress_page( byte* page_buf, /*!< in: preallocated buffer or NULL */ byte* buf, /*!< out: buffer from which to read; in aio this must be appropriately aligned */ - ulint len, /*!< in: length of output buffer.*/ + ulong len, /*!< in: length of output buffer.*/ ulint* write_size) /*!< in/out: Actual payload size of the compressed data. */ { diff --git a/storage/innobase/include/fil0pagecompress.h b/storage/innobase/include/fil0pagecompress.h index 74f6e45f4fb..e3a7ffbcb49 100644 --- a/storage/innobase/include/fil0pagecompress.h +++ b/storage/innobase/include/fil0pagecompress.h @@ -99,7 +99,7 @@ fil_decompress_page( byte* page_buf, /*!< in: preallocated buffer or NULL */ byte* buf, /*!< out: buffer from which to read; in aio this must be appropriately aligned */ - ulint len, /*!< in: length of output buffer.*/ + ulong len, /*!< in: length of output buffer.*/ ulint* write_size); /*!< in/out: Actual payload size of the compressed data. */ diff --git a/storage/xtradb/fil/fil0pagecompress.cc b/storage/xtradb/fil/fil0pagecompress.cc index 51f584883b5..bf6dd35e2f6 100644 --- a/storage/xtradb/fil/fil0pagecompress.cc +++ b/storage/xtradb/fil/fil0pagecompress.cc @@ -232,7 +232,7 @@ fil_decompress_page( byte* page_buf, /*!< in: preallocated buffer or NULL */ byte* buf, /*!< out: buffer from which to read; in aio this must be appropriately aligned */ - ulint len, /*!< in: length of output buffer.*/ + ulong len, /*!< in: length of output buffer.*/ ulint* write_size) /*!< in/out: Actual payload size of the compressed data. */ { diff --git a/storage/xtradb/include/fil0pagecompress.h b/storage/xtradb/include/fil0pagecompress.h index 74f6e45f4fb..e3a7ffbcb49 100644 --- a/storage/xtradb/include/fil0pagecompress.h +++ b/storage/xtradb/include/fil0pagecompress.h @@ -99,7 +99,7 @@ fil_decompress_page( byte* page_buf, /*!< in: preallocated buffer or NULL */ byte* buf, /*!< out: buffer from which to read; in aio this must be appropriately aligned */ - ulint len, /*!< in: length of output buffer.*/ + ulong len, /*!< in: length of output buffer.*/ ulint* write_size); /*!< in/out: Actual payload size of the compressed data. */