diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 01:04:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 01:04:43 +0200 |
| commit | 51c415d97d60cad732d05c9d5516f7fa3fde1df9 (patch) | |
| tree | 20a6bf272b15e11cf4b5a1fa7e6bf14267b3941b | |
| parent | 7828ba0df488de8c793e41e4bd3de79e06c2537f (diff) | |
| parent | 4fd1c7e453eac90928df1c74f443a6237fa792b8 (diff) | |
| download | mariadb-git-51c415d97d60cad732d05c9d5516f7fa3fde1df9.tar.gz | |
Merge branch 'merge/merge-xtradb-5.5' into 5.5mariadb-5.5.60
| -rw-r--r-- | storage/xtradb/include/univ.i | 4 | ||||
| -rw-r--r-- | storage/xtradb/trx/trx0purge.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index ddada668f79..ca51dc8de84 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 38.10 +#define PERCONA_INNODB_VERSION 38.11 #endif -#define INNODB_VERSION_STR "5.5.58-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) +#define INNODB_VERSION_STR "5.5.59-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) #define REFMAN "http://dev.mysql.com/doc/refman/" \ IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ diff --git a/storage/xtradb/trx/trx0purge.c b/storage/xtradb/trx/trx0purge.c index 2a9e80fe66a..428ff10bfdf 100644 --- a/storage/xtradb/trx/trx0purge.c +++ b/storage/xtradb/trx/trx0purge.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software |