diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-03 12:52:25 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-03 12:52:25 +0200 |
| commit | ec03390f9b39db005f612bf832ce9638da787eac (patch) | |
| tree | 0146fdbde4dd7025f9a1273e758002394c6ce308 /storage | |
| parent | d7d910d08bdbc5228933d404c576b93d56cd39e2 (diff) | |
| download | mariadb-git-ec03390f9b39db005f612bf832ce9638da787eac.tar.gz | |
fil_write_flushed_lsn(): Ensure that the return value is initialized
Previously, the function could theoretically return an uninitialized
value if the system tablespace contained no data files. It should be
impossible for InnoDB to start up in such scenario.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0fil.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index c9ecf3dab0b..b4102e48628 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -2074,7 +2074,7 @@ fil_write_flushed_lsn( { byte* buf1; byte* buf; - dberr_t err; + dberr_t err = DB_TABLESPACE_NOT_FOUND; buf1 = static_cast<byte*>(ut_malloc(2 * UNIV_PAGE_SIZE)); buf = static_cast<byte*>(ut_align(buf1, UNIV_PAGE_SIZE)); diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc index 502d33234ec..96902cd77ec 100644 --- a/storage/xtradb/fil/fil0fil.cc +++ b/storage/xtradb/fil/fil0fil.cc @@ -2125,7 +2125,7 @@ fil_write_flushed_lsn( { byte* buf1; byte* buf; - dberr_t err; + dberr_t err = DB_TABLESPACE_NOT_FOUND; buf1 = static_cast<byte*>(ut_malloc(2 * UNIV_PAGE_SIZE)); buf = static_cast<byte*>(ut_align(buf1, UNIV_PAGE_SIZE)); |