database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-mariarocks

Browse Source 
Manually resolved a few conflicts
This commit is contained in:
Sergei Petrunia
2017-03-11 20:00:08 +00:00
parent fd39f25ca7 65d01da29c
commit 5c1c2f67ec
87 changed files with 4766 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/rocksdb/rdb_mutex_wrapper.cc
View File

@@ -166,7 +166,7 @@ Rdb_mutex::Rdb_mutex() {
Rdb_mutex::~Rdb_mutex() { mysql_mutex_destroy(&m_mutex); }
Status Rdb_mutex::Lock() {
mysql_mutex_lock(&m_mutex);
RDB_MUTEX_LOCK_CHECK(m_mutex);
DBUG_ASSERT(m_old_stage_info.count(current_thd) == 0);
return Status::OK();
}
@@ -181,7 +181,7 @@ Status Rdb_mutex::TryLockFor(int64_t timeout_time MY_ATTRIBUTE((__unused__))) {
Note: PThreads API has pthread_mutex_timedlock(), but mysql's
mysql_mutex_* wrappers do not wrap that function.
*/
mysql_mutex_lock(&m_mutex);
RDB_MUTEX_LOCK_CHECK(m_mutex);
return Status::OK();
}
@@ -209,7 +209,7 @@ void Rdb_mutex::UnLock() {
return;
}
#endif
mysql_mutex_unlock(&m_mutex);
RDB_MUTEX_UNLOCK_CHECK(m_mutex);
}
} // namespace myrocks