revision-id: 959f7415bd5880f680320cfaebc11b4c77fe36bc (mariadb-10.0.37-60-g959f7415bd5) parent(s): c2197e0cd2a12cc7b76db74437ff6f60970bf314 3262afc6c50bdee489dd35feb8c5254dbc93494b author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-01-28 15:37:01 +0100 message: Merge branch 'merge-xtradb-5.6' into 10.0 storage/xtradb/include/univ.i | 2 +- storage/xtradb/log/log0online.cc | 41 +++++++++++++++++++++++++++++++++++++++- storage/xtradb/row/row0mysql.cc | 12 ------------ 3 files changed, 41 insertions(+), 14 deletions(-) diff --cc storage/xtradb/include/univ.i index e9ff9103fdd,4904e174b87..976bed244a0 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@@ -43,12 -42,12 +43,12 @@@ Created 1/20/1994 Heikki Tuur #define _IB_TO_STR(s) #s #define IB_TO_STR(s) _IB_TO_STR(s) -#define INNODB_VERSION_MAJOR MYSQL_VERSION_MAJOR -#define INNODB_VERSION_MINOR MYSQL_VERSION_MINOR -#define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH +#define INNODB_VERSION_MAJOR 5 +#define INNODB_VERSION_MINOR 6 +#define INNODB_VERSION_BUGFIX 39 #ifndef PERCONA_INNODB_VERSION - #define PERCONA_INNODB_VERSION 84.1 + #define PERCONA_INNODB_VERSION 84.2 #endif /* Enable UNIV_LOG_ARCHIVE in XtraDB */