compilation failure on Win64

cannot use &ulint_var (where ulint == unsigned __int64) where (ulong *) is expected (in uncompress() and in "%lu")
MariaDB · May 26, 2014 · 4e68faf · 4e68faf
1 parent 8eaa1d9
commit 4e68faf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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. */