[Commits] b4bb2f5208c: Build fixes

Sergei Petrunia psergey at askmonty.org
Mon Jan 7 19:33:25 EET 2019


revision-id: b4bb2f5208cd8a587156b84f2b6b8af35c999f71 (fb-prod201801-188-gb4bb2f5208c)
parent(s): a174d6a3e8e6fdc0d63268ede3a949f64b86baa0
author: Sergei Petrunia
committer: Sergei Petrunia
timestamp: 2019-01-07 20:33:25 +0300
message:

Build fixes

- s/return/DBUG_RETURN
- Initialize {start,end}_has_inf_suffix variables

---
 storage/rocksdb/ha_rocksdb.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
index d9758b8cf00..c4f611a663f 100644
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -8219,7 +8219,7 @@ int ha_rocksdb::set_range_lock(Rdb_transaction *tx,
 {
   rocksdb::Slice end_slice;
   uchar end_slice_buf[MAX_KEY_LENGTH];
-  bool start_has_inf_suffix, end_has_inf_suffix;
+  bool start_has_inf_suffix = false, end_has_inf_suffix = false;
 
   if (m_lock_rows != RDB_LOCK_WRITE || !rocksdb_use_range_locking) {
     return 0;
@@ -8250,6 +8250,7 @@ int ha_rocksdb::set_range_lock(Rdb_transaction *tx,
     memcpy(end_slice_buf, slice.data(), slice.size());
     kd.successor(end_slice_buf, slice.size());
     end_slice= rocksdb::Slice((const char*)end_slice_buf, slice.size());
+    start_has_inf_suffix= end_has_inf_suffix= false;
   }
   else if (end_key) {
     // Known start range bounds: HA_READ_KEY_OR_NEXT, HA_READ_AFTER_KEY
@@ -10496,8 +10497,8 @@ int ha_rocksdb::delete_row(const uchar *const buf) {
       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,
-                                       m_table_handler));
+          DBUG_RETURN(tx->set_status_error(table->in_use, s, kd, m_tbl_def,
+                                           m_table_handler));
         }
       }
 


More information about the commits mailing list