diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 16:14:13 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 17:26:15 +0200 |
| commit | c5f333adb6cf83e9c06b66f990ab69e0f5076b41 (patch) | |
| tree | e36ddcd86eb5c41260242091d9f88f032060006d /storage/tokudb/ha_tokudb.h | |
| parent | 1e88e855038559639ef23eb66483a243e2e25983 (diff) | |
| parent | f6716cef7eb267db958ce72c597d765bb8b7923e (diff) | |
| download | mariadb-git-c5f333adb6cf83e9c06b66f990ab69e0f5076b41.tar.gz | |
Merge branch 'merge-tokudb-5.6' into 10.0
Diffstat (limited to 'storage/tokudb/ha_tokudb.h')
| -rw-r--r-- | storage/tokudb/ha_tokudb.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/tokudb/ha_tokudb.h b/storage/tokudb/ha_tokudb.h index 3891e57738b..a2fd747bb92 100644 --- a/storage/tokudb/ha_tokudb.h +++ b/storage/tokudb/ha_tokudb.h @@ -318,18 +318,18 @@ inline int TOKUDB_SHARE::use_count() const { } inline void TOKUDB_SHARE::lock() const { TOKUDB_SHARE_DBUG_ENTER("file[%s]:state[%s]:use_count[%d]", - _full_table_name.ptr(), - get_state_string(_state), - _use_count); - _mutex.lock(); + _full_table_name.ptr(), + get_state_string(_state), + _use_count); + mutex_t_lock(_mutex); TOKUDB_SHARE_DBUG_VOID_RETURN(); } inline void TOKUDB_SHARE::unlock() const { TOKUDB_SHARE_DBUG_ENTER("file[%s]:state[%s]:use_count[%d]", - _full_table_name.ptr(), - get_state_string(_state), - _use_count); - _mutex.unlock(); + _full_table_name.ptr(), + get_state_string(_state), + _use_count); + mutex_t_unlock(_mutex); TOKUDB_SHARE_DBUG_VOID_RETURN(); } inline TOKUDB_SHARE::share_state_t TOKUDB_SHARE::state() const { |