From 00218503d69b7383c2d6cc40f6867982df87a23e Mon Sep 17 00:00:00 2001 From: Adriano dos Santos Fernandes Date: Fri, 24 Dec 2021 11:54:52 -0300 Subject: [PATCH] Revert "Fix warnings." This reverts commit 850e21a34ce34b1bc20c9c23bceff0f8070adc39. --- examples/udr/Triggers.cpp | 2 ++ src/dsql/metd.epp | 7 +++++++ src/jrd/vio.cpp | 9 ++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/examples/udr/Triggers.cpp b/examples/udr/Triggers.cpp index f397b9a373..4e9bcca834 100644 --- a/examples/udr/Triggers.cpp +++ b/examples/udr/Triggers.cpp @@ -234,6 +234,8 @@ FB_UDR_BEGIN_TRIGGER(replicate_persons) "select data_source from replicate_config where name = ?", SQL_DIALECT_CURRENT, NULL), status, statusVector); + const char* table = metadata->getTriggerTable(status); + // Skip the first exclamation point, separating the module name and entry point. const char* info = strchr(metadata->getEntryPoint(status), '!'); diff --git a/src/dsql/metd.epp b/src/dsql/metd.epp index bfb47f644e..9eb1ea8528 100644 --- a/src/dsql/metd.epp +++ b/src/dsql/metd.epp @@ -63,6 +63,13 @@ using namespace Firebird; DATABASE DB = STATIC "yachts.lnk"; +static const UCHAR blr_bpb[] = +{ + isc_bpb_version1, + isc_bpb_source_type, 1, isc_blob_blr, + isc_bpb_target_type, 1, isc_blob_blr +}; + static void convert_dtype(TypeClause*, SSHORT); static void free_relation(dsql_rel*); diff --git a/src/jrd/vio.cpp b/src/jrd/vio.cpp index 07aaa3fb7a..8af88effdc 100644 --- a/src/jrd/vio.cpp +++ b/src/jrd/vio.cpp @@ -238,6 +238,7 @@ inline void check_gbak_cheating_insupd(thread_db* tdbb, const jrd_rel* relation, inline void check_gbak_cheating_delete(thread_db* tdbb, const jrd_rel* relation) { const Attachment* const attachment = tdbb->getAttachment(); + const jrd_tra* const transaction = tdbb->getTransaction(); if (relation->isSystem() && attachment->isGbak()) { @@ -2526,6 +2527,8 @@ bool VIO_get_current(thread_db* tdbb, **************************************/ SET_TDBB(tdbb); + Attachment* const attachment = tdbb->getAttachment(); + #ifdef VIO_DEBUG jrd_rel* relation = rpb->rpb_relation; VIO_trace(DEBUG_TRACE, @@ -5192,12 +5195,12 @@ static void list_staying_fast(thread_db* tdbb, record_param* rpb, RecordStack& s } } - ///const TraNumber oldest_active = tdbb->getTransaction()->tra_oldest_active; + const TraNumber oldest_active = tdbb->getTransaction()->tra_oldest_active; while (temp.rpb_b_page) { - ///ULONG page = temp.rpb_page = temp.rpb_b_page; - ///USHORT line = temp.rpb_line = temp.rpb_b_line; + ULONG page = temp.rpb_page = temp.rpb_b_page; + USHORT line = temp.rpb_line = temp.rpb_b_line; temp.rpb_record = NULL; if (temp.rpb_flags & rpb_delta)