diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 13:54:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-28 13:54:37 +0200 |
| commit | 67a3ddf17abfd182b99e16cc539dc72be5da707b (patch) | |
| tree | 6b20386ca41187ffa358ebb0873d56b97a8e9903 /storage/xtradb/include | |
| parent | c581ae08a706a34f8698850ed12689e8d92c421f (diff) | |
| parent | 40e95608d99c2997e4af445ec4da68febc9e87f1 (diff) | |
| download | mariadb-git-67a3ddf17abfd182b99e16cc539dc72be5da707b.tar.gz | |
Merge branch 'merge-xtradb-5.5' into 5.5
Diffstat (limited to 'storage/xtradb/include')
| -rw-r--r-- | storage/xtradb/include/univ.i | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index 1154e2e2f42..a377911022e 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -64,10 +64,10 @@ component, i.e. we show M.N.P as M.N */ (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR) #ifndef PERCONA_INNODB_VERSION -#define PERCONA_INNODB_VERSION 37.0 +#define PERCONA_INNODB_VERSION 37.1 #endif -#define INNODB_VERSION_STR "5.5.41-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) +#define INNODB_VERSION_STR "5.5.42-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) #define REFMAN "http://dev.mysql.com/doc/refman/" \ IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ |