Commit fca0698f authored by Thirunarayanan Balathandayuthapani's avatar Thirunarayanan Balathandayuthapani Committed by Marko Mäkelä

Bug #25385590 DROP TABLE CRASHES IF INNODB_FORCE_RECOVERY > 4

- Allow the server to start if innodb force recovery is set to 6
even though change buffer is not empty
Reviewed-by: default avatarJimmy Yang <jimmy.yang@oracle.com>
parent 67e9c4cf
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2016, MariaDB Corporation. Copyright (c) 2016, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
...@@ -488,7 +488,9 @@ dict_boot(void) ...@@ -488,7 +488,9 @@ dict_boot(void)
err = ibuf_init_at_db_start(); err = ibuf_init_at_db_start();
if (err == DB_SUCCESS) { if (err == DB_SUCCESS) {
if (srv_read_only_mode && !ibuf_is_empty()) { if (srv_read_only_mode
&& srv_force_recovery != SRV_FORCE_NO_LOG_REDO
&& !ibuf_is_empty()) {
if (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE) { if (srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE) {
ib::error() << "Change buffer must be empty when" ib::error() << "Change buffer must be empty when"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment