database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-07-02 17:46:22 +03:00
parent 709f0510e3 7f1e1309bb
commit e82fe21e3a
320 changed files with 23190 additions and 7611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/rocksdb/rdb_threads.cc
View File

@@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
#ifdef USE_PRAGMA_IMPLEMENTATION
#pragma implementation // gcc: Class implementation
#pragma implementation // gcc: Class implementation
#endif
#include <my_global.h>
@@ -42,7 +42,7 @@ void Rdb_thread::init(
my_core::PSI_mutex_key stop_bg_psi_mutex_key,
my_core::PSI_cond_key stop_bg_psi_cond_key
#endif
) {
) {
DBUG_ASSERT(!m_run_once);
mysql_mutex_init(stop_bg_psi_mutex_key, &m_signal_mutex, MY_MUTEX_INIT_FAST);
mysql_cond_init(stop_bg_psi_cond_key, &m_signal_cond, nullptr);
@@ -58,7 +58,7 @@ int Rdb_thread::create_thread(const std::string &thread_name
,
PSI_thread_key background_psi_thread_key
#endif
) {
) {
// Make a copy of the name so we can return without worrying that the
// caller will free the memory
m_name = thread_name;
@@ -68,7 +68,7 @@ int Rdb_thread::create_thread(const std::string &thread_name
}
void Rdb_thread::signal(const bool &stop_thread) {
void Rdb_thread::signal(const bool stop_thread) {
RDB_MUTEX_LOCK_CHECK(m_signal_mutex);
if (stop_thread) {
@@ -80,4 +80,4 @@ void Rdb_thread::signal(const bool &stop_thread) {
RDB_MUTEX_UNLOCK_CHECK(m_signal_mutex);
}
} // namespace myrocks
} // namespace myrocks