diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 00:31:15 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 00:31:15 +0300 |
| commit | e7bb818116d6fad5376452a7d0b326e8787f6a0e (patch) | |
| tree | 930f94c9b61465b3f07ce1f1f19ad6e27c469681 /storage/xtradb | |
| parent | d947d1bf6e1ebd20c0142832bb2372bf5a5bf6bf (diff) | |
| parent | f534eef79414f0cbf9b0404146e1076a6df6b45f (diff) | |
| download | mariadb-git-e7bb818116d6fad5376452a7d0b326e8787f6a0e.tar.gz | |
Merge remote-tracking branch 'merge/merge-xtradb-5.5' into 5.5
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/include/univ.i | 2 | ||||
| -rw-r--r-- | storage/xtradb/trx/trx0sys.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index 3ecfe8d26e1..71adedbd6a2 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -64,7 +64,7 @@ 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.8 +#define PERCONA_INNODB_VERSION 38.9 #endif #define INNODB_VERSION_STR "5.5.55-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) diff --git a/storage/xtradb/trx/trx0sys.c b/storage/xtradb/trx/trx0sys.c index a56e55c0e19..f801331dbf0 100644 --- a/storage/xtradb/trx/trx0sys.c +++ b/storage/xtradb/trx/trx0sys.c @@ -730,7 +730,7 @@ trx_sys_doublewrite_init_or_restore_pages( TRUE, read_buf, zip_size))) { fprintf(stderr, - "InnoDB: Warning: database page" + "InnoDB: Database page" " corruption or a failed\n" "InnoDB: file read of" " space %lu page %lu.\n" |