Misc

Author: AlexPeshkoff

src/jrd/jrd.cpp

@@ -7796,7 +7796,7 @@ bool JRD_shutdown_database(Database* dbb, const unsigned flags)
 	delete dbb->dbb_crypto_manager;
 	dbb->dbb_crypto_manager = NULL;
 
-	//dbb->dbb_mdc->destroyIntlObjects(tdbb);
+	dbb->dbb_mdc->destroyIntlObjects(tdbb);
 	MetadataCache::clear_cache(tdbb);
 
 	// Shut down any extern relations

src/jrd/met.h

@@ -260,14 +260,13 @@ class CharSetContainer : public HazardObject
 	void destroy(thread_db* tdbb)
 	{
 		cs->destroy();
-		for (auto coll : charset_collations)
-		{
-			if (coll)
-				coll->destroy(tdbb);
-		}
+		release(tdbb);
 	}
 
-	CharSet* getCharSet() { return cs; }
+	CharSet* getCharSet()
+	{
+		return cs;
+	}
 
 	HazardPtr<Collation> lookupCollation(thread_db* tdbb, USHORT tt_id);
 	void unloadCollation(thread_db* tdbb, USHORT tt_id);
@@ -277,9 +276,9 @@ class CharSetContainer : public HazardObject
 	static HazardPtr<CharSetContainer> lookupCharset(thread_db* tdbb, USHORT ttype);
 	static Lock* createCollationLock(thread_db* tdbb, USHORT ttype, void* object = NULL);
 
-	bool hasData()
+	bool hasData() const
 	{
-		return true;
+		return cs != nullptr;
 	}
 
 private: