diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-23 15:15:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-23 15:23:27 +0300 |
| commit | 61b5e244d6a2079a35d76092be132dd625aafc02 (patch) | |
| tree | 06b58f2510a3ef72b8456d8e74a7276e7022ba9f /storage/innobase | |
| parent | e6c1e588f05bd022262e68eb10f3634558e3f42c (diff) | |
| download | mariadb-git-61b5e244d6a2079a35d76092be132dd625aafc02.tar.gz | |
MDEV-20127 Merge new release of InnoDB 5.6.45 to 10.1
There is one directly applicable change to InnoDB:
commit 739f5239f12904247d2a61f9880ea1fafbedc332 in the
5.5 branch will be merged before the next MariaDB releases.
Another potentially applicable change will be tracked
separately as MDEV-20126.
Thus, here we only update the InnoDB version number and do
not change anything else.
Diffstat (limited to 'storage/innobase')
| -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 dba52d3f647..02ab9e8b94f 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -45,7 +45,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MINOR 6 -#define INNODB_VERSION_BUGFIX 44 +#define INNODB_VERSION_BUGFIX 45 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; |