diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-17 12:11:12 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-17 12:11:12 +0300 |
| commit | d8b45b0c004edc0b91029b232d7cc9aad02cc822 (patch) | |
| tree | 4461fa973957a077ee5daf782617cf65161b68bb /storage/xtradb/include/univ.i | |
| parent | dfeff407067e2eaa27a51a04306863f912ec4cc6 (diff) | |
| parent | 360a4a037271d65ab6471f7ab3f9b6a893d90a31 (diff) | |
| download | mariadb-git-d8b45b0c004edc0b91029b232d7cc9aad02cc822.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/include/univ.i')
| -rw-r--r-- | storage/xtradb/include/univ.i | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index fff5c0a67a1..a82faa76eef 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -48,7 +48,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_BUGFIX 35 #ifndef PERCONA_INNODB_VERSION -#define PERCONA_INNODB_VERSION 80.0 +#define PERCONA_INNODB_VERSION 82.0 #endif /* Enable UNIV_LOG_ARCHIVE in XtraDB */ @@ -146,14 +146,8 @@ HAVE_PSI_INTERFACE is defined. */ #if defined HAVE_PSI_INTERFACE && !defined UNIV_HOTBACKUP # define UNIV_PFS_MUTEX # define UNIV_PFS_RWLOCK -/* For I/O instrumentation, performance schema rely -on a native descriptor to identify the file, this -descriptor could conflict with our OS level descriptor. -Disable IO instrumentation on Windows until this is -resolved */ -# ifndef __WIN__ -# define UNIV_PFS_IO -# endif + +# define UNIV_PFS_IO # define UNIV_PFS_THREAD /* There are mutexes/rwlocks that we want to exclude from |