summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-09-19 00:25:34 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-09-19 00:25:34 +0300
commitf534eef79414f0cbf9b0404146e1076a6df6b45f (patch)
treeca62a5effdaa78a5aaf08b65d217941d52e28de3
parent46977e0a01ae2118df08c3cccaf2f0eaaabd2715 (diff)
downloadmariadb-git-f534eef79414f0cbf9b0404146e1076a6df6b45f.tar.gz
5.5.57-38.9merge-xtradb-5.5
-rw-r--r--storage/xtradb/include/univ.i2
-rw-r--r--storage/xtradb/trx/trx0sys.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i
index a7475bbf396..12c3c833e33 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 MYSQL_SERVER_VERSION
diff --git a/storage/xtradb/trx/trx0sys.c b/storage/xtradb/trx/trx0sys.c
index 6b230a296c0..193cb9055ec 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"