diff options
Diffstat (limited to 'storage/xtradb/ibuf/ibuf0ibuf.cc')
| -rw-r--r-- | storage/xtradb/ibuf/ibuf0ibuf.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/storage/xtradb/ibuf/ibuf0ibuf.cc b/storage/xtradb/ibuf/ibuf0ibuf.cc index ef6c9c74558..972208c51bd 100644 --- a/storage/xtradb/ibuf/ibuf0ibuf.cc +++ b/storage/xtradb/ibuf/ibuf0ibuf.cc @@ -611,8 +611,7 @@ ibuf_init_at_db_start(void) heap = mem_heap_create(450); /* Use old-style record format for the insert buffer. */ - table = dict_mem_table_create(IBUF_TABLE_NAME, IBUF_SPACE_ID, 1, 0, 0, - false); + table = dict_mem_table_create(IBUF_TABLE_NAME, IBUF_SPACE_ID, 1, 0, 0); dict_mem_table_add_col(table, heap, "DUMMY_COLUMN", DATA_BINARY, 0, 0); @@ -1573,7 +1572,7 @@ ibuf_dummy_index_create( table = dict_mem_table_create("IBUF_DUMMY", DICT_HDR_SPACE, n, - comp ? DICT_TF_COMPACT : 0, 0, true); + comp ? DICT_TF_COMPACT : 0, 0); index = dict_mem_index_create("IBUF_DUMMY", "IBUF_DUMMY", DICT_HDR_SPACE, 0, n); @@ -2879,6 +2878,12 @@ ibuf_contract_in_background( mutex_exit(&ibuf_mutex); } +#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG + if (ibuf_debug) { + return(0); + } +#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ + while (sum_pages < n_pages) { ulint n_bytes; @@ -3931,7 +3936,7 @@ check_watch: { buf_page_t* bpage; buf_pool_t* buf_pool = buf_pool_get(space, page_no); - bpage = buf_page_hash_get(buf_pool, space, page_no); + bpage = buf_page_get_also_watch(buf_pool, space, page_no); if (UNIV_LIKELY_NULL(bpage)) { /* A buffer pool watch has been set or the |