mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sergei Golubchik 2018-01-18 17:56:28 +01:00
commit fafdac3365
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/xtradb/include/log0online.h
View file

@ -141,7 +141,11 @@ log_online_bitmap_iterator_next(
/** Struct for single bitmap file information */ /** Struct for single bitmap file information */
struct log_online_bitmap_file_struct { struct log_online_bitmap_file_struct {
char name[FN_REFLEN]; /*!< Name with full path */ /** Name with full path
61 is a nice magic constant for the extra space needed for the sprintf
template in the cc file
*/
char name[FN_REFLEN+61]; /*!< Name with full path */
os_file_t file; /*!< Handle to opened file */ os_file_t file; /*!< Handle to opened file */
ib_uint64_t size; /*!< Size of the file */ ib_uint64_t size; /*!< Size of the file */
ib_uint64_t offset; /*!< Offset of the next read, ib_uint64_t offset; /*!< Offset of the next read,

4
storage/xtradb/include/univ.i
View file

@ -64,10 +64,10 @@ 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.9 #define PERCONA_INNODB_VERSION 38.10
#endif #endif
#define INNODB_VERSION_STR "5.5.55-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION) #define INNODB_VERSION_STR "5.5.58-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
#define REFMAN "http://dev.mysql.com/doc/refman/" \ #define REFMAN "http://dev.mysql.com/doc/refman/" \
IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ IB_TO_STR(MYSQL_MAJOR_VERSION) "." \

6
storage/xtradb/log/log0online.c
View file

@ -501,9 +501,9 @@ log_online_make_bitmap_name(
/*=========================*/ /*=========================*/
ib_uint64_t start_lsn) /*!< in: the start LSN name part */ ib_uint64_t start_lsn) /*!< in: the start LSN name part */
{ {
ut_snprintf(log_bmp_sys->out.name, FN_REFLEN, bmp_file_name_template, ut_snprintf(log_bmp_sys->out.name, sizeof(log_bmp_sys->out.name),
log_bmp_sys->bmp_file_home, bmp_file_name_stem, bmp_file_name_template, log_bmp_sys->bmp_file_home,
log_bmp_sys->out_seq_num, start_lsn); bmp_file_name_stem, log_bmp_sys->out_seq_num, start_lsn);
} }
/*********************************************************************//** /*********************************************************************//**