revision-id: 82413942bcf691dea1975e9674558b4c0f9de9bd (fb-prod201801-171-g82413942bcf) parent(s): ed5c828882cf85ffa53e33c350d9cebb10f72a4b author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-12-02 19:54:28 +0300 message: Update rocksdb, now we get proper error code on deadlock rocksdb.rqg_transactions 'range_locking' --- rocksdb | 2 +- storage/rocksdb/ha_rocksdb.cc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/rocksdb b/rocksdb index 0ba14a1efa8..574dd4e574d 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 0ba14a1efa8f4cfccedc85c7efa317be35c60333 +Subproject commit 574dd4e574d60263db9d37faede89057caefafca diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index d5d8ead4883..3ec6b189f8b 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -8136,7 +8136,6 @@ void ha_rocksdb::set_range_lock(Rdb_transaction *tx, if (m_lock_rows != RDB_LOCK_WRITE || !rocksdb_use_range_locking) { return; } - fprintf(stderr, "Setting a range lock\n"); if (find_flag == HA_READ_KEY_EXACT) { end_slice= slice;