From 8794e993a464797cf055b9917039aebff43183e0 Mon Sep 17 00:00:00 2001 From: Vlad Khorsun Date: Wed, 13 Jul 2022 12:45:41 +0300 Subject: [PATCH] Corrections according to Dmitry comments --- src/jrd/trace/TraceConfigStorage.h | 2 +- src/lock/lock.cpp | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/jrd/trace/TraceConfigStorage.h b/src/jrd/trace/TraceConfigStorage.h index 7ab768892f..6caf3e04a2 100644 --- a/src/jrd/trace/TraceConfigStorage.h +++ b/src/jrd/trace/TraceConfigStorage.h @@ -116,7 +116,7 @@ private: USHORT getType() const override { return Firebird::SharedMemoryBase::SRAM_TRACE_CONFIG; } USHORT getVersion() const override { return TraceCSHeader::TRACE_STORAGE_VERSION; } - const char* getName() const override { return "ConfigStorage"; } + const char* getName() const override { return "TraceConfigStorage"; } void checkAudit(); diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp index f68e250f90..889883cb12 100644 --- a/src/lock/lock.cpp +++ b/src/lock/lock.cpp @@ -1642,17 +1642,6 @@ SRQ_PTR LockManager::create_owner(CheckStatusWrapper* statusVector, * Create an owner block. * **************************************/ - if (!checkHeader(m_sharedMemory->getHeader(), false)) // is it still needed here ? - { - TEXT bug_buffer[BUFFER_TINY]; - sprintf(bug_buffer, "inconsistent lock table type/version; found %d/%d:%d, expected %d/%d:%d", - m_sharedMemory->getHeader()->mhb_type, - m_sharedMemory->getHeader()->mhb_header_version, - m_sharedMemory->getHeader()->mhb_version, - SharedMemoryBase::SRAM_LOCK_MANAGER, MemoryHeader::HEADER_VERSION, LHB_VERSION); - bug(statusVector, bug_buffer); - return 0; - } // Allocate a process block, if required