Merge remote-tracking branch 'merge/merge-xtradb-5.5' into 5.5

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)

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"