diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-31 11:58:29 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-31 11:58:29 +0200 |
commit | 865e807125d1d3fb2d784ea33f1154ba999466ec (patch) | |
tree | ea354d6e52e97f599bb5d3809295daae8c9fceeb /storage/innobase/include/univ.i | |
parent | 14306bcbec0b6a999985008f3d33602c08058006 (diff) | |
parent | 4c21c367b332e4ebfff0b0c1f6f5140d5845588e (diff) | |
download | mariadb-git-865e807125d1d3fb2d784ea33f1154ba999466ec.tar.gz |
Merge branch '10.0' into 10.1
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 7304d1e5d87..dc1dd9db5d1 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 40 +#define INNODB_VERSION_BUGFIX 41 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; |