diff options
Diffstat (limited to 'storage/innobase/srv/srv0start.cc')
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index c4bc50dd93a..ecfcc499004 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -1308,7 +1308,7 @@ dberr_t srv_start(bool create_new_db) << srv_buf_pool_size << ", chunk size = " << srv_buf_pool_chunk_unit; - if (buf_pool_init()) { + if (buf_pool.create()) { ib::error() << "Cannot allocate memory for the buffer pool"; return(srv_init_abort(DB_ERROR)); @@ -2172,11 +2172,8 @@ void innodb_shutdown() pars_lexer_close(); recv_sys.close(); - ut_ad(buf_pool || !srv_was_started); - if (buf_pool) { - buf_pool_free(); - } - + ut_ad(buf_pool.is_initialised() || !srv_was_started); + buf_pool.close(); sync_check_close(); if (srv_was_started && srv_print_verbose_log) { |