diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 15:13:40 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-14 15:13:40 +0300 |
commit | 07e89bf7d15ba9e9a3b21d087c20d687446b2ff7 (patch) | |
tree | 4c0482a9fca5949c2d7384b626a5f1f5decb4394 | |
parent | 646a6005e7882f9d4baf516c7936e5ef88ea89a6 (diff) | |
download | mariadb-git-07e89bf7d15ba9e9a3b21d087c20d687446b2ff7.tar.gz |
MDEV-23163 Merge new release of InnoDB 5.7.31 to 10.2
The only InnoDB change between MySQL 5.7.30 and MySQL 5.7.31
that is applicable to MariaDB Server was applied in
commit 8d061996e6531b2809aefb0ed96e0662b2c2882e (MDEV-23161).
-rw-r--r-- | storage/innobase/include/univ.i | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index dbb1048a2e5..c7474cff4ea 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -41,7 +41,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MINOR 7 -#define INNODB_VERSION_BUGFIX 30 +#define INNODB_VERSION_BUGFIX 31 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; |