diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-26 21:11:53 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-26 21:11:53 +0200 |
| commit | 6a85b10dcb39b41587ce66d0434c651182d33832 (patch) | |
| tree | 3853fc7a69b927eab820d1826665b6a1b297f1fa /storage/innobase/fil | |
| parent | 1016ee9d77e8c9cd6e9bd114b808fff66f398255 (diff) | |
| parent | 4e68fafad44fbb5ea57a3cf9a750690d88f6fe1c (diff) | |
| download | mariadb-git-6a85b10dcb39b41587ce66d0434c651182d33832.tar.gz | |
merge the compilation fixes from 10.0-FusionIO
Diffstat (limited to 'storage/innobase/fil')
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 1 | ||||
| -rw-r--r-- | storage/innobase/fil/fil0pagecompress.cc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 58fa51c52d5..09d969556a6 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -63,7 +63,6 @@ static ulint srv_data_read, srv_data_written; #include <linux/fs.h> #include <sys/ioctl.h> #include <fcntl.h> -#include <linux/falloc.h> #endif #include "row0mysql.h" 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. */ { |