diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h
index afa2848ae88..79cfb6b4040 100644
--- a/include/thread_pool_priv.h
+++ b/include/thread_pool_priv.h
@@ -98,8 +98,6 @@ void mysql_audit_release(THD *thd);
 bool thd_is_connection_alive(THD *thd);
 /* Close connection with possible error code */
 void close_connection(THD *thd, uint errcode);
-/* End the connection before closing it */
-void end_connection(THD *thd);
 /* Decrement connection counter */
 void dec_connection_count();
 /* Destroy THD object */
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 278677b8b2d..d7b388e310f 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1122,7 +1122,6 @@ void end_connection(THD *thd)
   }
   thd->wsrep_client_thread= 0;
 #endif
-  plugin_thdvar_cleanup(thd);
 
   if (thd->user_connect)
   {
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
index a6689f7707f..768c967ef63 100644
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -14010,6 +14010,8 @@ rocksdb_set_update_cf_options(THD *const /* unused */,
 
   RDB_MUTEX_LOCK_CHECK(rdb_sysvars_mutex);
 
+  my_free(*reinterpret_cast<void **>(var_ptr));
+
   if (!val) {
     *reinterpret_cast<char **>(var_ptr) = nullptr;
     RDB_MUTEX_UNLOCK_CHECK(rdb_sysvars_mutex);