summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-07-30 11:01:16 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-07-30 11:06:46 +0300
commit4860fe244bd1f4a6f3b803648d651e49e7b92a2c (patch)
tree799b4c932a131a99091c90a85fdd2309cf1751b5
parent7e9ffc69ecd1bddf731391b01e6be221efb6f8ef (diff)
downloadmariadb-git-4860fe244bd1f4a6f3b803648d651e49e7b92a2c.tar.gz
XtraDB 5.6.49-89.0
The only change between Percona XtraDB Server 5.6.48-88.0 and 5.6.49-89.0 (apart from the version number change) was percona/percona-server@25ec24092064c2ab95752705e592e0c038ec1111 which we had already addressed in commit 7c03edf2fe66855a8ce8f2575c3aaf66af975377 and commit c0fca2863bcbd7cd231f1aa747b4f8d999e3a00e.
-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 6181b49aa12..c8a0250504e 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.49
-+GLOBAL_VALUE 5.6.48-88.0
++GLOBAL_VALUE 5.6.49-89.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 bb59709ef4f..af9060d7334 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.49
-+GLOBAL_VALUE 5.6.48-88.0
++GLOBAL_VALUE 5.6.49-89.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 c0849bf0e2d..61a8639691a 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 48
+#define INNODB_VERSION_BUGFIX 49
#ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 88.0
+#define PERCONA_INNODB_VERSION 89.0
#endif
/* Enable UNIV_LOG_ARCHIVE in XtraDB */