diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-18 18:16:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-18 18:16:10 +0200 |
| commit | 4db6e86ebec7213b294df395299772430d1b0e63 (patch) | |
| tree | 797d44852f594641acf3bf67c39b8c90d89224e4 | |
| parent | bf9bc991066df78a37e917127d61d044700c3950 (diff) | |
| download | mariadb-git-4db6e86ebec7213b294df395299772430d1b0e63.tar.gz | |
MDEV-27539 Merge new release of InnoDB 5.7.37 to 10.2
There were no InnoDB changes in the MySQL 5.7.37 release that would be
relevant to MariaDB Server. We will merely update the reported
InnoDB version number.
| -rw-r--r-- | storage/innobase/include/univ.i | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index fb1f5b705aa..92466ff595d 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2021, MariaDB Corporation. +Copyright (c) 2013, 2022, MariaDB Corporation. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -41,7 +41,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MINOR 7 -#define INNODB_VERSION_BUGFIX 36 +#define INNODB_VERSION_BUGFIX 37 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; |