Skip to content

M
mariadb
Commit 174bccd3 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

xtradb 5.6.22-72.0

parents 6b05688f dfb001ed
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 38 deletions
mysql-test/suite/innodb/r/innodb_bug34300.result
View file @ 174bccd3
ERROR 42000: Row size too large (> ####). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline. ERROR 42000: The size of BLOB/TEXT data inserted in one transaction is greater than 10% of redo log size. Increase the redo log size using innodb_log_file_size.
f4 f8 f4 f8
f4 f8 f4 f8
mysql-test/suite/innodb/t/innodb_bug34300.test
View file @ 174bccd3
...@@ -5,6 +5,11 @@ ...@@ -5,6 +5,11 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
if (`select plugin_auth_version <= "5.6.22-MariaDB-72.0" from information_schema.plugins where plugin_name='innodb'`)
{
--skip Not fixed in XtraDB as of 5.6.22-MariaDB-72.0 or earlier
}
-- disable_query_log -- disable_query_log
-- disable_result_log -- disable_result_log
......
storage/xtradb/buf/buf0buf.cc
View file @ 174bccd3
...@@ -294,7 +294,6 @@ UNIV_INTERN mysql_pfs_key_t buf_block_debug_latch_key; ...@@ -294,7 +294,6 @@ UNIV_INTERN mysql_pfs_key_t buf_block_debug_latch_key;
#ifdef UNIV_PFS_MUTEX #ifdef UNIV_PFS_MUTEX
UNIV_INTERN mysql_pfs_key_t buffer_block_mutex_key; UNIV_INTERN mysql_pfs_key_t buffer_block_mutex_key;
UNIV_INTERN mysql_pfs_key_t buf_pool_mutex_key;
UNIV_INTERN mysql_pfs_key_t buf_pool_zip_mutex_key; UNIV_INTERN mysql_pfs_key_t buf_pool_zip_mutex_key;
UNIV_INTERN mysql_pfs_key_t buf_pool_flush_state_mutex_key; UNIV_INTERN mysql_pfs_key_t buf_pool_flush_state_mutex_key;
UNIV_INTERN mysql_pfs_key_t buf_pool_LRU_list_mutex_key; UNIV_INTERN mysql_pfs_key_t buf_pool_LRU_list_mutex_key;
...@@ -1777,16 +1776,12 @@ page_found: ...@@ -1777,16 +1776,12 @@ page_found:
ut_ad(!bpage->in_page_hash); ut_ad(!bpage->in_page_hash);
ut_ad(bpage->buf_fix_count == 0); ut_ad(bpage->buf_fix_count == 0);
mutex_enter(&buf_pool->zip_mutex);
bpage->state = BUF_BLOCK_ZIP_PAGE; bpage->state = BUF_BLOCK_ZIP_PAGE;
bpage->space = static_cast<ib_uint32_t>(space); bpage->space = static_cast<ib_uint32_t>(space);
bpage->offset = static_cast<ib_uint32_t>(offset); bpage->offset = static_cast<ib_uint32_t>(offset);
bpage->buf_fix_count = 1; bpage->buf_fix_count = 1;
bpage->buf_pool_index = buf_pool_index(buf_pool); bpage->buf_pool_index = buf_pool_index(buf_pool);
mutex_exit(&buf_pool->zip_mutex);
ut_d(bpage->in_page_hash = TRUE); ut_d(bpage->in_page_hash = TRUE);
HASH_INSERT(buf_page_t, hash, buf_pool->page_hash, HASH_INSERT(buf_page_t, hash, buf_pool->page_hash,
fold, bpage); fold, bpage);
...@@ -1838,7 +1833,6 @@ buf_pool_watch_remove( ...@@ -1838,7 +1833,6 @@ buf_pool_watch_remove(
#endif /* UNIV_SYNC_DEBUG */ #endif /* UNIV_SYNC_DEBUG */
ut_ad(buf_page_get_state(watch) == BUF_BLOCK_ZIP_PAGE); ut_ad(buf_page_get_state(watch) == BUF_BLOCK_ZIP_PAGE);
ut_ad(buf_own_zip_mutex_for_page(watch));
HASH_DELETE(buf_page_t, hash, buf_pool->page_hash, fold, watch); HASH_DELETE(buf_page_t, hash, buf_pool->page_hash, fold, watch);
ut_d(watch->in_page_hash = FALSE); ut_d(watch->in_page_hash = FALSE);
...@@ -1881,9 +1875,7 @@ buf_pool_watch_unset( ...@@ -1881,9 +1875,7 @@ buf_pool_watch_unset(
#endif /* PAGE_ATOMIC_REF_COUNT */ #endif /* PAGE_ATOMIC_REF_COUNT */
if (bpage->buf_fix_count == 0) { if (bpage->buf_fix_count == 0) {
mutex_enter(&buf_pool->zip_mutex);
buf_pool_watch_remove(buf_pool, fold, bpage); buf_pool_watch_remove(buf_pool, fold, bpage);
mutex_exit(&buf_pool->zip_mutex);
} }
} }
...@@ -4467,7 +4459,7 @@ corrupt: ...@@ -4467,7 +4459,7 @@ corrupt:
#endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */ #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
buf_page_get_flush_type(bpage) == BUF_FLUSH_LRU)) { buf_page_get_flush_type(bpage) == BUF_FLUSH_LRU)) {
have_LRU_mutex = TRUE; /* optimistic */ have_LRU_mutex = true; /* optimistic */
} }
retry_mutex: retry_mutex:
if (have_LRU_mutex) { if (have_LRU_mutex) {
...@@ -4487,6 +4479,7 @@ retry_mutex: ...@@ -4487,6 +4479,7 @@ retry_mutex:
&& !have_LRU_mutex) { && !have_LRU_mutex) {
mutex_exit(block_mutex); mutex_exit(block_mutex);
have_LRU_mutex = true;
goto retry_mutex; goto retry_mutex;
} }
......
storage/xtradb/buf/buf0flu.cc
View file @ 174bccd3
...@@ -1093,8 +1093,8 @@ buf_flush_page( ...@@ -1093,8 +1093,8 @@ buf_flush_page(
# if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG # if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
/********************************************************************//** /********************************************************************//**
Writes a flushable page asynchronously from the buffer pool to a file. Writes a flushable page asynchronously from the buffer pool to a file.
NOTE: block->mutex must be held upon entering this function, and it will be NOTE: block and LRU list mutexes must be held upon entering this function, and
released by this function after flushing. This is loosely based on they will be released by this function after flushing. This is loosely based on
buf_flush_batch() and buf_flush_page(). buf_flush_batch() and buf_flush_page().
@return TRUE if the page was flushed and the mutexes released */ @return TRUE if the page was flushed and the mutexes released */
UNIV_INTERN UNIV_INTERN
...@@ -1645,6 +1645,8 @@ buf_do_LRU_batch( ...@@ -1645,6 +1645,8 @@ buf_do_LRU_batch(
flush_counters_t* n) /*!< out: flushed/evicted page flush_counters_t* n) /*!< out: flushed/evicted page
counts */ counts */
{ {
ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
if (buf_LRU_evict_from_unzip_LRU(buf_pool)) { if (buf_LRU_evict_from_unzip_LRU(buf_pool)) {
n->unzip_LRU_evicted n->unzip_LRU_evicted
= buf_free_from_unzip_LRU_list_batch(buf_pool, max); = buf_free_from_unzip_LRU_list_batch(buf_pool, max);
......
storage/xtradb/buf/buf0lru.cc
View file @ 174bccd3
...@@ -526,7 +526,7 @@ buf_flush_or_remove_page( ...@@ -526,7 +526,7 @@ buf_flush_or_remove_page(
mutex_exit(block_mutex); mutex_exit(block_mutex);
*must_restart = TRUE; *must_restart = true;
processed = false; processed = false;
} else if (!flush) { } else if (!flush) {
......
storage/xtradb/buf/buf0rea.cc
View file @ 174bccd3
...@@ -640,9 +640,9 @@ buf_read_ahead_linear( ...@@ -640,9 +640,9 @@ buf_read_ahead_linear(
fail_count = 0; fail_count = 0;
for (i = low; i < high; i++) { prio_rw_lock_t* hash_lock;
prio_rw_lock_t* hash_lock; for (i = low; i < high; i++) {
bpage = buf_page_hash_get_s_locked(buf_pool, space, i, bpage = buf_page_hash_get_s_locked(buf_pool, space, i,
&hash_lock); &hash_lock);
...@@ -691,7 +691,7 @@ buf_read_ahead_linear( ...@@ -691,7 +691,7 @@ buf_read_ahead_linear(
/* If we got this far, we know that enough pages in the area have /* If we got this far, we know that enough pages in the area have
been accessed in the right order: linear read-ahead can be sensible */ been accessed in the right order: linear read-ahead can be sensible */
bpage = buf_page_hash_get(buf_pool, space, offset); bpage = buf_page_hash_get_s_locked(buf_pool, space, offset, &hash_lock);
if (bpage == NULL) { if (bpage == NULL) {
...@@ -719,6 +719,8 @@ buf_read_ahead_linear( ...@@ -719,6 +719,8 @@ buf_read_ahead_linear(
pred_offset = fil_page_get_prev(frame); pred_offset = fil_page_get_prev(frame);
succ_offset = fil_page_get_next(frame); succ_offset = fil_page_get_next(frame);
rw_lock_s_unlock(hash_lock);
if ((offset == low) && (succ_offset == offset + 1)) { if ((offset == low) && (succ_offset == offset + 1)) {
/* This is ok, we can continue */ /* This is ok, we can continue */
......
storage/xtradb/handler/ha_innodb.cc
View file @ 174bccd3
...@@ -354,7 +354,6 @@ static PSI_mutex_info all_innodb_mutexes[] = { ...@@ -354,7 +354,6 @@ static PSI_mutex_info all_innodb_mutexes[] = {
# ifndef PFS_SKIP_BUFFER_MUTEX_RWLOCK # ifndef PFS_SKIP_BUFFER_MUTEX_RWLOCK
{&buffer_block_mutex_key, "buffer_block_mutex", 0}, {&buffer_block_mutex_key, "buffer_block_mutex", 0},
# endif /* !PFS_SKIP_BUFFER_MUTEX_RWLOCK */ # endif /* !PFS_SKIP_BUFFER_MUTEX_RWLOCK */
{&buf_pool_mutex_key, "buf_pool_mutex", 0},
{&buf_pool_zip_mutex_key, "buf_pool_zip_mutex", 0}, {&buf_pool_zip_mutex_key, "buf_pool_zip_mutex", 0},
{&buf_pool_LRU_list_mutex_key, "buf_pool_LRU_list_mutex", 0}, {&buf_pool_LRU_list_mutex_key, "buf_pool_LRU_list_mutex", 0},
{&buf_pool_free_list_mutex_key, "buf_pool_free_list_mutex", 0}, {&buf_pool_free_list_mutex_key, "buf_pool_free_list_mutex", 0},
......
storage/xtradb/handler/i_s.cc
View file @ 174bccd3
...@@ -5187,11 +5187,6 @@ i_s_innodb_fill_buffer_pool( ...@@ -5187,11 +5187,6 @@ i_s_innodb_fill_buffer_pool(
info_buffer = (buf_page_info_t*) mem_heap_zalloc( info_buffer = (buf_page_info_t*) mem_heap_zalloc(
heap, mem_size); heap, mem_size);
/* Obtain appropriate mutexes. Since this is diagnostic
buffer pool info printout, we are not required to
preserve the overall consistency, so we can
release mutex periodically */
/* GO through each block in the chunk */ /* GO through each block in the chunk */
for (n_blocks = num_to_process; n_blocks--; block++) { for (n_blocks = num_to_process; n_blocks--; block++) {
i_s_innodb_buffer_page_get_info( i_s_innodb_buffer_page_get_info(
......
storage/xtradb/include/buf0flu.h
View file @ 174bccd3
...@@ -78,8 +78,8 @@ buf_flush_init_for_writing( ...@@ -78,8 +78,8 @@ buf_flush_init_for_writing(
# if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG # if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
/********************************************************************//** /********************************************************************//**
Writes a flushable page asynchronously from the buffer pool to a file. Writes a flushable page asynchronously from the buffer pool to a file.
NOTE: block->mutex must be held upon entering this function, and they will be NOTE: block and LRU list mutexes must be held upon entering this function, and
released by this function after flushing. This is loosely based on they will be released by this function after flushing. This is loosely based on
buf_flush_batch() and buf_flush_page(). buf_flush_batch() and buf_flush_page().
@return TRUE if the page was flushed and the mutexes released */ @return TRUE if the page was flushed and the mutexes released */
UNIV_INTERN UNIV_INTERN
......
storage/xtradb/include/sync0sync.h
View file @ 174bccd3
...@@ -69,7 +69,6 @@ instrumentation due to their large number of instances. */ ...@@ -69,7 +69,6 @@ instrumentation due to their large number of instances. */
/* Key defines to register InnoDB mutexes with performance schema */ /* Key defines to register InnoDB mutexes with performance schema */
extern mysql_pfs_key_t autoinc_mutex_key; extern mysql_pfs_key_t autoinc_mutex_key;
extern mysql_pfs_key_t buffer_block_mutex_key; extern mysql_pfs_key_t buffer_block_mutex_key;
extern mysql_pfs_key_t buf_pool_mutex_key;
extern mysql_pfs_key_t buf_pool_zip_mutex_key; extern mysql_pfs_key_t buf_pool_zip_mutex_key;
extern mysql_pfs_key_t buf_pool_LRU_list_mutex_key; extern mysql_pfs_key_t buf_pool_LRU_list_mutex_key;
extern mysql_pfs_key_t buf_pool_free_list_mutex_key; extern mysql_pfs_key_t buf_pool_free_list_mutex_key;
......
storage/xtradb/include/univ.i
View file @ 174bccd3
...@@ -47,7 +47,7 @@ Created 1/20/1994 Heikki Tuuri ...@@ -47,7 +47,7 @@ Created 1/20/1994 Heikki Tuuri
#define INNODB_VERSION_BUGFIX 22 #define INNODB_VERSION_BUGFIX 22
#ifndef PERCONA_INNODB_VERSION #ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION 71.0 #define PERCONA_INNODB_VERSION 72.0
#endif #endif
/* Enable UNIV_LOG_ARCHIVE in XtraDB */ /* Enable UNIV_LOG_ARCHIVE in XtraDB */
......
storage/xtradb/srv/srv0start.cc
View file @ 174bccd3
...@@ -129,20 +129,30 @@ UNIV_INTERN enum srv_shutdown_state srv_shutdown_state = SRV_SHUTDOWN_NONE; ...@@ -129,20 +129,30 @@ UNIV_INTERN enum srv_shutdown_state srv_shutdown_state = SRV_SHUTDOWN_NONE;
static os_file_t files[1000]; static os_file_t files[1000];
/** io_handler_thread parameters for thread identification */ /** io_handler_thread parameters for thread identification */
static ulint n[SRV_MAX_N_IO_THREADS + 6]; static ulint n[SRV_MAX_N_IO_THREADS];
/** io_handler_thread identifiers, 32 is the maximum number of purge threads */ /** io_handler_thread identifiers, 32 is the maximum number of purge threads.
static os_thread_id_t thread_ids[SRV_MAX_N_IO_THREADS + 6 The extra elements at the end are allocated as follows:
SRV_MAX_N_IO_THREADS + 1: srv_master_thread
SRV_MAX_N_IO_THREADS + 2: lock_wait_timeout_thread
SRV_MAX_N_IO_THREADS + 3: srv_error_monitor_thread
SRV_MAX_N_IO_THREADS + 4: srv_monitor_thread
SRV_MAX_N_IO_THREADS + 5: srv_redo_log_follow_thread
SRV_MAX_N_IO_THREADS + 6: srv_purge_coordinator_thread
SRV_MAX_N_IO_THREADS + 7: srv_worker_thread
...
SRV_MAX_N_IO_THREADS + 7 + srv_n_purge_threads - 1: srv_worker_thread */
static os_thread_id_t thread_ids[SRV_MAX_N_IO_THREADS + 7
+ SRV_MAX_N_PURGE_THREADS]; + SRV_MAX_N_PURGE_THREADS];
/** Thead handles */ /** Thead handles */
static os_thread_t thread_handles[SRV_MAX_N_IO_THREADS + 6 + SRV_MAX_N_PURGE_THREADS]; static os_thread_t thread_handles[SRV_MAX_N_IO_THREADS + 7 + SRV_MAX_N_PURGE_THREADS];
static os_thread_t buf_flush_page_cleaner_thread_handle; static os_thread_t buf_flush_page_cleaner_thread_handle;
static os_thread_t buf_dump_thread_handle; static os_thread_t buf_dump_thread_handle;
static os_thread_t dict_stats_thread_handle; static os_thread_t dict_stats_thread_handle;
static os_thread_t buf_flush_lru_manager_thread_handle; static os_thread_t buf_flush_lru_manager_thread_handle;
static os_thread_t srv_redo_log_follow_thread_handle; static os_thread_t srv_redo_log_follow_thread_handle;
/** Status variables, is thread started ?*/ /** Status variables, is thread started ?*/
static bool thread_started[SRV_MAX_N_IO_THREADS + 6 + SRV_MAX_N_PURGE_THREADS] = {false}; static bool thread_started[SRV_MAX_N_IO_THREADS + 7 + SRV_MAX_N_PURGE_THREADS] = {false};
static bool buf_flush_page_cleaner_thread_started = false; static bool buf_flush_page_cleaner_thread_started = false;
static bool buf_dump_thread_started = false; static bool buf_dump_thread_started = false;
static bool dict_stats_thread_started = false; static bool dict_stats_thread_started = false;
...@@ -1883,6 +1893,7 @@ innobase_start_or_create_for_mysql(void) ...@@ -1883,6 +1893,7 @@ innobase_start_or_create_for_mysql(void)
+ 1 /* srv_error_monitor_thread */ + 1 /* srv_error_monitor_thread */
+ 1 /* srv_monitor_thread */ + 1 /* srv_monitor_thread */
+ 1 /* srv_master_thread */ + 1 /* srv_master_thread */
+ 1 /* srv_redo_log_follow_thread */
+ 1 /* srv_purge_coordinator_thread */ + 1 /* srv_purge_coordinator_thread */
+ 1 /* buf_dump_thread */ + 1 /* buf_dump_thread */
+ 1 /* dict_stats_thread */ + 1 /* dict_stats_thread */
...@@ -2790,21 +2801,21 @@ files_checked: ...@@ -2790,21 +2801,21 @@ files_checked:
if (!srv_read_only_mode if (!srv_read_only_mode
&& srv_force_recovery < SRV_FORCE_NO_BACKGROUND) { && srv_force_recovery < SRV_FORCE_NO_BACKGROUND) {
thread_handles[5 + SRV_MAX_N_IO_THREADS] = os_thread_create( thread_handles[6 + SRV_MAX_N_IO_THREADS] = os_thread_create(
srv_purge_coordinator_thread, srv_purge_coordinator_thread,
NULL, thread_ids + 5 + SRV_MAX_N_IO_THREADS); NULL, thread_ids + 6 + SRV_MAX_N_IO_THREADS);
thread_started[5 + SRV_MAX_N_IO_THREADS] = true; thread_started[6 + SRV_MAX_N_IO_THREADS] = true;
ut_a(UT_ARR_SIZE(thread_ids) ut_a(UT_ARR_SIZE(thread_ids)
> 5 + srv_n_purge_threads + SRV_MAX_N_IO_THREADS); > 6 + srv_n_purge_threads + SRV_MAX_N_IO_THREADS);
/* We've already created the purge coordinator thread above. */ /* We've already created the purge coordinator thread above. */
for (i = 1; i < srv_n_purge_threads; ++i) { for (i = 1; i < srv_n_purge_threads; ++i) {
thread_handles[5 + i + SRV_MAX_N_IO_THREADS] = os_thread_create( thread_handles[6 + i + SRV_MAX_N_IO_THREADS] = os_thread_create(
srv_worker_thread, NULL, srv_worker_thread, NULL,
thread_ids + 5 + i + SRV_MAX_N_IO_THREADS); thread_ids + 6 + i + SRV_MAX_N_IO_THREADS);
thread_started[5 + i + SRV_MAX_N_IO_THREADS] = true; thread_started[6 + i + SRV_MAX_N_IO_THREADS] = true;
} }
srv_start_wait_for_purge_to_start(); srv_start_wait_for_purge_to_start();
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7