diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-01-18 17:56:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-01-18 17:56:28 +0100 |
| commit | fafdac3365f4943e73bcefd0e0d07d69997a9724 (patch) | |
| tree | 4b52e29b966c94917fcfe8c205c3a96c67710ec0 /storage | |
| parent | 2d52d3c1bf46d2d5123ee986fff94858899cdf33 (diff) | |
| parent | 85a5e58d71d3e641b6d6911148a1a22bff779293 (diff) | |
| download | mariadb-git-fafdac3365f4943e73bcefd0e0d07d69997a9724.tar.gz | |
Merge branch 'merge/merge-xtradb-5.5' into 5.5mariadb-5.5.59
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/xtradb/include/log0online.h | 6 | ||||
| -rw-r--r-- | storage/xtradb/include/univ.i | 4 | ||||
| -rw-r--r-- | storage/xtradb/log/log0online.c | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/storage/xtradb/include/log0online.h b/storage/xtradb/include/log0online.h index 2462263dec2..ee06ec1951e 100644 --- a/storage/xtradb/include/log0online.h +++ b/storage/xtradb/include/log0online.h @@ -141,7 +141,11 @@ log_online_bitmap_iterator_next( /** Struct for single bitmap file information */ 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 */ ib_uint64_t size; /*!< Size of the file */ ib_uint64_t offset; /*!< Offset of the next read, diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index 71adedbd6a2..6cc424ad0ba 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -64,10 +64,10 @@ 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.9 +#define PERCONA_INNODB_VERSION 38.10 #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/" \ IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ diff --git a/storage/xtradb/log/log0online.c b/storage/xtradb/log/log0online.c index 45739dffa5d..0354ef29ea8 100644 --- a/storage/xtradb/log/log0online.c +++ b/storage/xtradb/log/log0online.c @@ -501,9 +501,9 @@ log_online_make_bitmap_name( /*=========================*/ ib_uint64_t start_lsn) /*!< in: the start LSN name part */ { - ut_snprintf(log_bmp_sys->out.name, FN_REFLEN, bmp_file_name_template, - log_bmp_sys->bmp_file_home, bmp_file_name_stem, - log_bmp_sys->out_seq_num, start_lsn); + ut_snprintf(log_bmp_sys->out.name, sizeof(log_bmp_sys->out.name), + bmp_file_name_template, log_bmp_sys->bmp_file_home, + bmp_file_name_stem, log_bmp_sys->out_seq_num, start_lsn); } /*********************************************************************//** |