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/xb0xb.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/xb0xb.h')
| -rw-r--r-- | extra/mariabackup/xb0xb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/mariabackup/xb0xb.h b/extra/mariabackup/xb0xb.h index 659ab8ea5d0..c6e4ae22de6 100644 --- a/extra/mariabackup/xb0xb.h +++ b/extra/mariabackup/xb0xb.h @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA extern void os_io_init_simple(void); -extern os_file_t files[1000]; +extern pfs_os_file_t files[1000]; extern const char *innodb_checksum_algorithm_names[]; extern TYPELIB innodb_checksum_algorithm_typelib; extern dberr_t open_or_create_data_files( |