Post merge fix

rocksdb_set_update_cf_options functions was freeing a pointer which it should not.

Post merge fix
rocksdb_set_update_cf_options functions was freeing a pointer which it should not.
34ff2967 · Varun Gupta · 48cfb3b8 · 34ff2967
Commit 34ff2967 authored Feb 08, 2018 by Varun Gupta
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

storage/rocksdb/ha_rocksdb.cc storage/rocksdb/ha_rocksdb.cc +0 -1

No files found.
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -13141,7 +13141,6 @@ rocksdb_set_update_cf_options(THD *const /* unused */,
    }
  }

-    my_free(*reinterpret_cast<char**>(var_ptr));
  // Our caller (`plugin_var_memalloc_global_update`) will call `my_free` to
  // free up resources used before.