revision-id: 4509d1cb9b26e4ad77be96daf3bfab176d9ff1da (fb-prod201801-195-g4509d1cb9b2) parent(s): a088bdc2eda68aed64da38744d141a1f5447a34e author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-25 20:47:44 +0300 message: Code cleanup: correct argument to KillLockWait --- rocksdb | 2 +- storage/rocksdb/ha_rocksdb.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rocksdb b/rocksdb index e836be43ec6..902585ed89b 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit e836be43ec6c2bd9250764e09b51766b11b04390 +Subproject commit 902585ed89b86b26e8e1ef8b055c268fd1c0e8ca diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index f6f11ad4133..78749c86aea 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -4488,7 +4488,7 @@ void Rdb_transaction::kill_lock_wait_by_thd(THD *thd) if (tx && tx->m_last_trx_id != UINT64_MAX) { - rdb->KillLockWait((void*)tx->m_last_trx_id); + rdb->KillLockWait(tx->m_last_trx_id); } RDB_MUTEX_UNLOCK_CHECK(Rdb_transaction::s_tx_list_mutex); }