mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-21534 fixup: Remove traces of removed log_sys.write_mutex

Browse source 
This was missed in commit 30ea63b7d2.
This commit is contained in:
Marko Mäkelä 2020-09-30 13:48:20 +03:00
commit 8bc4ebed67
7 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
storage/innobase/handler/ha_innodb.cc
View file

@ -524,7 +524,6 @@ static PSI_mutex_info all_innodb_mutexes[] = {
PSI_KEY(ibuf_mutex),
PSI_KEY(ibuf_pessimistic_insert_mutex),
PSI_KEY(log_sys_mutex),
PSI_KEY(log_sys_write_mutex),
PSI_KEY(mutex_list_mutex),
PSI_KEY(page_zip_stat_per_index_mutex),
PSI_KEY(purge_sys_pq_mutex),

2
storage/innobase/include/log0log.h
View file

@ -547,7 +547,7 @@ public:
byte *flush_buf;
/** recommended maximum size of buf, after which the buffer is flushed */
size_t max_buf_free;
/** Log file stuff. Protected by mutex or write_mutex. */
/** Log file stuff. Protected by mutex. */
struct file {
/** format of the redo log: e.g., FORMAT_10_5 */
uint32_t format;

3
storage/innobase/include/srv0srv.h
View file

@ -74,8 +74,7 @@ struct srv_stats_t
/** Amount of data written to the log files in bytes */
lsn_ctr_1_t os_log_written;
/** Number of writes being done to the log files.
Protected by log_sys.write_mutex. */
/** Number of writes being done to the log files */
ulint_ctr_1_t os_log_pending_writes;
/** We increase this counter, when we don't have enough

1
storage/innobase/include/sync0sync.h
View file

@ -65,7 +65,6 @@ extern mysql_pfs_key_t ibuf_bitmap_mutex_key;
extern mysql_pfs_key_t ibuf_mutex_key;
extern mysql_pfs_key_t ibuf_pessimistic_insert_mutex_key;
extern mysql_pfs_key_t log_sys_mutex_key;
extern mysql_pfs_key_t log_sys_write_mutex_key;
extern mysql_pfs_key_t log_cmdq_mutex_key;
extern mysql_pfs_key_t log_flush_order_mutex_key;
extern mysql_pfs_key_t mutex_list_mutex_key;

2
storage/innobase/include/sync0types.h
View file

@ -212,7 +212,6 @@ enum latch_level_t {
SYNC_RECV,
SYNC_LOG_FLUSH_ORDER,
SYNC_LOG,
SYNC_LOG_WRITE,
SYNC_PAGE_CLEANER,
SYNC_PURGE_QUEUE,
SYNC_TRX_SYS_HEADER,
@ -297,7 +296,6 @@ enum latch_id_t {
LATCH_ID_IBUF,
LATCH_ID_IBUF_PESSIMISTIC_INSERT,
LATCH_ID_LOG_SYS,
LATCH_ID_LOG_WRITE,
LATCH_ID_LOG_FLUSH_ORDER,
LATCH_ID_LIST,
LATCH_ID_MUTEX_LIST,

4
storage/innobase/sync/sync0debug.cc
View file

@ -469,7 +469,6 @@ LatchDebug::LatchDebug()
LEVEL_MAP_INSERT(SYNC_RECV);
LEVEL_MAP_INSERT(SYNC_LOG_FLUSH_ORDER);
LEVEL_MAP_INSERT(SYNC_LOG);
LEVEL_MAP_INSERT(SYNC_LOG_WRITE);
LEVEL_MAP_INSERT(SYNC_PAGE_CLEANER);
LEVEL_MAP_INSERT(SYNC_PURGE_QUEUE);
LEVEL_MAP_INSERT(SYNC_TRX_SYS_HEADER);
@ -750,7 +749,6 @@ LatchDebug::check_order(
case SYNC_FTS_CACHE_INIT:
case SYNC_PAGE_CLEANER:
case SYNC_LOG:
case SYNC_LOG_WRITE:
case SYNC_LOG_FLUSH_ORDER:
case SYNC_DOUBLEWRITE:
case SYNC_SEARCH_SYS:
@ -1292,8 +1290,6 @@ sync_latch_meta_init()
LATCH_ADD_MUTEX(LOG_SYS, SYNC_LOG, log_sys_mutex_key);
LATCH_ADD_MUTEX(LOG_WRITE, SYNC_LOG_WRITE, log_sys_write_mutex_key);
LATCH_ADD_MUTEX(LOG_FLUSH_ORDER, SYNC_LOG_FLUSH_ORDER,
log_flush_order_mutex_key);

1
storage/innobase/sync/sync0sync.cc
View file

@ -51,7 +51,6 @@ mysql_pfs_key_t ibuf_bitmap_mutex_key;
mysql_pfs_key_t ibuf_mutex_key;
mysql_pfs_key_t ibuf_pessimistic_insert_mutex_key;
mysql_pfs_key_t log_sys_mutex_key;
mysql_pfs_key_t log_sys_write_mutex_key;
mysql_pfs_key_t log_cmdq_mutex_key;
mysql_pfs_key_t log_flush_order_mutex_key;
mysql_pfs_key_t mutex_list_mutex_key;