firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 22:43:03 +01:00
Code Issues

Corrections according to Dmitry comments

Browse Source
This commit is contained in:
Vlad Khorsun 2022-07-13 12:45:41 +03:00
parent ef607e37c5
commit 8794e993a4
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jrd/trace/TraceConfigStorage.h
View File

@ -116,7 +116,7 @@ private:
USHORT getType() const override { return Firebird::SharedMemoryBase::SRAM_TRACE_CONFIG; } USHORT getType() const override { return Firebird::SharedMemoryBase::SRAM_TRACE_CONFIG; }
USHORT getVersion() const override { return TraceCSHeader::TRACE_STORAGE_VERSION; } 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(); void checkAudit();

11
src/lock/lock.cpp
View File

@ -1642,17 +1642,6 @@ SRQ_PTR LockManager::create_owner(CheckStatusWrapper* statusVector,
* Create an owner block. * 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 // Allocate a process block, if required