summaryrefslogtreecommitdiff
path: root/storage/innobase/include/ibuf0ibuf.ic
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/include/ibuf0ibuf.ic')
-rw-r--r--storage/innobase/include/ibuf0ibuf.ic10
1 files changed, 7 insertions, 3 deletions
diff --git a/storage/innobase/include/ibuf0ibuf.ic b/storage/innobase/include/ibuf0ibuf.ic
index db8c122c0f7..ba772359630 100644
--- a/storage/innobase/include/ibuf0ibuf.ic
+++ b/storage/innobase/include/ibuf0ibuf.ic
@@ -44,6 +44,11 @@ ibuf_mtr_start(
{
mtr_start(mtr);
mtr->enter_ibuf();
+
+ if (high_level_read_only || srv_read_only_mode) {
+ mtr_set_log_mode(mtr, MTR_LOG_NONE);
+ }
+
}
/***************************************************************//**
Commits an insert buffer mini-transaction. */
@@ -126,12 +131,11 @@ ibuf_should_try(
decide */
{
return(innodb_change_buffering
- && ibuf->max_size != 0
+ && ibuf.max_size != 0
&& !dict_index_is_clust(index)
&& !dict_index_is_spatial(index)
&& index->table->quiesce == QUIESCE_NONE
- && (ignore_sec_unique || !dict_index_is_unique(index))
- && srv_force_recovery < SRV_FORCE_NO_IBUF_MERGE);
+ && (ignore_sec_unique || !dict_index_is_unique(index)));
}
/******************************************************************//**