Skip to content

M
MariaDB
Commit e7bb8181 authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru
Browse files
Options

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

parents d947d1bf f534eef7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/xtradb/include/univ.i
View file @ e7bb8181
...@@ -64,7 +64,7 @@ component, i.e. we show M.N.P as M.N */ ...@@ -64,7 +64,7 @@ component, i.e. we show M.N.P as M.N */
(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR) (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
#ifndef PERCONA_INNODB_VERSION #ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 38.8 #define PERCONA_INNODB_VERSION 38.9
#endif #endif
#define INNODB_VERSION_STR "5.5.55-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) #define INNODB_VERSION_STR "5.5.55-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
......
storage/xtradb/trx/trx0sys.c
View file @ e7bb8181
...@@ -730,7 +730,7 @@ trx_sys_doublewrite_init_or_restore_pages( ...@@ -730,7 +730,7 @@ trx_sys_doublewrite_init_or_restore_pages(
TRUE, read_buf, zip_size))) { TRUE, read_buf, zip_size))) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: database page" "InnoDB: Database page"
" corruption or a failed\n" " corruption or a failed\n"
"InnoDB: file read of" "InnoDB: file read of"
" space %lu page %lu.\n" " space %lu page %lu.\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7