summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-27 11:39:46 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-27 11:39:46 +0300
commitd956175d0d15e8c84e4e3ff5b0798143ce3ccfe8 (patch)
treee840ca06c58ed07c44ff6ff7efda530afe083381
parentedbdfc2f995eb47ba49235195aca00888aeacbc4 (diff)
downloadmariadb-git-d956175d0d15e8c84e4e3ff5b0798143ce3ccfe8.tar.gz
XtraDB 5.6.47-87.0
The only change is a change of the version number. As noted in commit 02af6278fb7c7889a02d617eb23e82fe7967abd7 there were no changes to InnoDB between MySQL 5.6.46 and 5.6.47 either.
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff2
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff2
-rw-r--r--storage/xtradb/include/univ.i4
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
index fe6ec0e6f33..47289d2887b 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
@@ -1215,7 +1215,7 @@
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.47
-+GLOBAL_VALUE 5.6.46-86.2
++GLOBAL_VALUE 5.6.47-87.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
index 5fab6de421a..4e630e5e56f 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
@@ -685,7 +685,7 @@
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.47
-+GLOBAL_VALUE 5.6.46-86.2
++GLOBAL_VALUE 5.6.47-87.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i
index f5cc649f944..0b7ab3e389e 100644
--- a/storage/xtradb/include/univ.i
+++ b/storage/xtradb/include/univ.i
@@ -45,10 +45,10 @@ Created 1/20/1994 Heikki Tuuri
#define INNODB_VERSION_MAJOR 5
#define INNODB_VERSION_MINOR 6
-#define INNODB_VERSION_BUGFIX 46
+#define INNODB_VERSION_BUGFIX 47
#ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 86.2
+#define PERCONA_INNODB_VERSION 87.0
#endif
/* Enable UNIV_LOG_ARCHIVE in XtraDB */