1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vicențiu Ciorbaru 2017-09-19 00:31:15 +03:00
commit e7bb818116
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/xtradb/include/univ.i
View File

@ -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)

2
storage/xtradb/trx/trx0sys.c
View File

@ -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"