diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-26 20:42:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-26 20:42:06 +0200 |
| commit | 4e68fafad44fbb5ea57a3cf9a750690d88f6fe1c (patch) | |
| tree | db29ea05503ed6053cef79e66613b54ec1ab28c3 /storage | |
| parent | 8eaa1d90a47df52f5abefdd73b4fa64cdb26c59c (diff) | |
| download | mariadb-git-4e68fafad44fbb5ea57a3cf9a750690d88f6fe1c.tar.gz | |
compilation failure on Win64
cannot use &ulint_var (where ulint == unsigned __int64)
where (ulong *) is expected (in uncompress() and in "%lu")
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/fil/fil0pagecompress.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/include/fil0pagecompress.h | 2 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0pagecompress.cc | 2 | ||||
| -rw-r--r-- | 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. */ |