mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
43d5edf97c
commit 394d0712d3d46a87a8063e14e998e9c22336e3a6
Author: Anca Agape <anca@fb.com>
Date: Thu Jul 27 15:43:07 2017 -0700
Fix rpl.rpl_4threads_deadlock test broken by D5005670
Summary:
In D5005670 in fill_fields_processlist() function we introduced a point
where we were trying to take the LOCK_thd_data before the
synchronization point used by test
processlist_after_LOCK_thd_count_before_LOCK_thd_data. This was
happening in get_attached_srv_session() function called. Replaced this
with get_attached_srv_session_safe() and moved it after lock is aquired.
Reviewed By: tianx
Differential Revision: D5505992
fbshipit-source-id: bc53924
56 lines
1.8 KiB
C++
56 lines
1.8 KiB
C++
/* Copyright (c) 2017, Percona and/or its affiliates. All rights reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
#pragma once
|
|
|
|
#ifndef _rdb_psi_h_
|
|
#define _rdb_psi_h_
|
|
|
|
/* MySQL header files */
|
|
#include <my_global.h>
|
|
#include <my_pthread.h>
|
|
#include <mysql/psi/psi.h>
|
|
|
|
/* MyRocks header files */
|
|
#include "./rdb_utils.h"
|
|
|
|
namespace myrocks {
|
|
|
|
/*
|
|
The following is needed as an argument for mysql_stage_register,
|
|
irrespectively of whether we're compiling with P_S or not.
|
|
*/
|
|
extern my_core::PSI_stage_info stage_waiting_on_row_lock;
|
|
|
|
#ifdef HAVE_PSI_INTERFACE
|
|
extern my_core::PSI_thread_key rdb_background_psi_thread_key,
|
|
rdb_drop_idx_psi_thread_key;
|
|
|
|
extern my_core::PSI_mutex_key rdb_psi_open_tbls_mutex_key,
|
|
rdb_signal_bg_psi_mutex_key, rdb_signal_drop_idx_psi_mutex_key,
|
|
rdb_collation_data_mutex_key, rdb_mem_cmp_space_mutex_key,
|
|
key_mutex_tx_list, rdb_sysvars_psi_mutex_key, rdb_cfm_mutex_key;
|
|
|
|
extern my_core::PSI_rwlock_key key_rwlock_collation_exception_list,
|
|
key_rwlock_read_free_rpl_tables, key_rwlock_skip_unique_check_tables;
|
|
|
|
extern my_core::PSI_cond_key rdb_signal_bg_psi_cond_key,
|
|
rdb_signal_drop_idx_psi_cond_key;
|
|
#endif // HAVE_PSI_INTERFACE
|
|
|
|
void init_rocksdb_psi_keys();
|
|
|
|
} // namespace myrocks
|
|
|
|
#endif // _rdb_psi_h_
|