diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-24 16:28:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-25 13:05:23 +0300 |
| commit | 30c3d6db328d73f1b30be537aceb55d37936fdb9 (patch) | |
| tree | 36f818006db7131e467214cb2561cc0afae51ee6 /storage/innobase/include | |
| parent | 2549f982891f4598768f10f2aa549861ea7152d1 (diff) | |
| download | mariadb-git-30c3d6db328d73f1b30be537aceb55d37936fdb9.tar.gz | |
MDEV-17533 Merge new release of InnoDB 5.6.42 to 10.0
Also, add a test for a bug that does not seem to affect MariaDB.
Diffstat (limited to 'storage/innobase/include')
| -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 8cd3f85f835..a9d886607c0 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 41 +#define INNODB_VERSION_BUGFIX 42 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; |