diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-26 14:11:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-26 14:11:09 +0200 |
| commit | 15ec8c2f28f08517ecbffb959d756b4bdd53ab45 (patch) | |
| tree | eea0aeec5fcff4946eb4838629745e3b6ca901d8 /storage/innobase/include/univ.i | |
| parent | 619afb151b38a538ef64d5387643c01f86e203d8 (diff) | |
| parent | 5883c6905b5345be55f3c1a1efbd741bb697b115 (diff) | |
| download | mariadb-git-15ec8c2f28f08517ecbffb959d756b4bdd53ab45.tar.gz | |
Merge branch 'merge-innodb-5.6' into 10.0
Diffstat (limited to 'storage/innobase/include/univ.i')
| -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 882b472f9d9..a83914ac79f 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 37 +#define INNODB_VERSION_BUGFIX 40 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; |