From ecc2d836f03fd9c05e6c4d69ca23419c905db6f1 Mon Sep 17 00:00:00 2001
From: Yi Zhang <yzha@fb.com>
Date: Mon, 10 Jun 2019 17:39:57 -0700
Subject: [PATCH] Include RocksDB fix that address deadlock

Upstream commit ID : fb-mysql-5.6.35/603097e97d615c141f21f61b4bf440ad2a40557c
PS-6867 : Merge fb-prod201905

Summary:
This includes two RocksDB deadlock fixes:

1. Avoid deadlock between mutex_ and log_write_mutex_: https://github.com/facebook/rocksdb/pull/5437
2. WritePrepared: Fix deadlock in WriteRecoverableState: https://github.com/facebook/rocksdb/pull/5306

update-submodule: rocksdb

Reviewed By: hermanlee

Differential Revision: D15753718

fbshipit-source-id: ec6b9b7e381
---
 storage/rocksdb/rocksdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage/rocksdb/rocksdb b/storage/rocksdb/rocksdb
index 990b2f4cb313..ba64a4cf52cc 160000
--- a/storage/rocksdb/rocksdb
+++ b/storage/rocksdb/rocksdb
@@ -1 +1 @@
-Subproject commit 990b2f4cb313f4a47cb0bc3ba907862e6c47d4b0
+Subproject commit ba64a4cf52cce5cf180135e5aeddaa90b7887f9d