diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-19 13:59:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-20 08:41:20 +0300 |
| commit | 65e1399e64a306f1ce1d920e66206954f8630da8 (patch) | |
| tree | a3c22c1f76d15721e982f34e1ac9e6b828e711a2 /extra/mariabackup/xtrabackup.h | |
| parent | 13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (diff) | |
| parent | 335c4ab790254462753ba4ed8b074c5847b2708f (diff) | |
| download | mariadb-git-65e1399e64a306f1ce1d920e66206954f8630da8.tar.gz | |
Merge 10.0 into 10.1
Significantly reduce the amount of InnoDB, XtraDB and Mariabackup
code changes by defining pfs_os_file_t as something that is
transparently compatible with os_file_t.
Diffstat (limited to 'extra/mariabackup/xtrabackup.h')
| -rw-r--r-- | extra/mariabackup/xtrabackup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.h b/extra/mariabackup/xtrabackup.h index 51491ce1f00..d3c4c486d9f 100644 --- a/extra/mariabackup/xtrabackup.h +++ b/extra/mariabackup/xtrabackup.h @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include "changed_page_bitmap.h" #ifdef __WIN__ -#define XB_FILE_UNDEFINED NULL +#define XB_FILE_UNDEFINED INVALID_HANDLE_VALUE #else #define XB_FILE_UNDEFINED (-1) #endif @@ -194,7 +194,7 @@ void xb_data_files_close(void); /*********************************************************************** Reads the space flags from a given data file and returns the compressed page size, or 0 if the space is not compressed. */ -ulint xb_get_zip_size(os_file_t file); +ulint xb_get_zip_size(pfs_os_file_t file); /************************************************************************ Checks if a table specified as a name in the form "database/name" (InnoDB 5.6) |