revision-id: 9dfa6234f2092c3e65f54823731b65b2a6360b52 (fb-prod202002-128-g9dfa6234f20) parent(s): b211e08c0b717a7a12b239c941d2be891a03c52a author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2020-08-24 18:26:15 +0300 message: Post-rebase fixes part 2: use DBUG_RETURN, not return --- storage/rocksdb/ha_rocksdb.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 053fe4a99f6..a2e5900373f 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -11337,11 +11337,13 @@ int ha_rocksdb::delete_row(const uchar *const buf) { /* For point locking, Deleting on secondary key doesn't need any locks. Range locking must set locks + (TODO: don't get the lock here if we've got it in key_info->flags & + HA_NOSAME branch above?) */ if (rocksdb_use_range_locking) { auto s= tx->lock_singlepoint_range(kd.get_cf(), secondary_key_slice); if (!s.ok()) { - return (tx->set_status_error(table->in_use, s, kd, m_tbl_def, + DBUG_RETURN(tx->set_status_error(table->in_use, s, kd, m_tbl_def, m_table_handler)); } }