Skip to content

Commit 525e566

Browse files
committed
Corrections after LTT changes
1 parent b1d8d64 commit 525e566

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/dsql/metd.epp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ void METD_drop_relation(jrd_tra* transaction, const QualifiedName& name)
267267

268268
if (dbb->dbb_relations.get(name, relation))
269269
{
270-
if (!(relation->rel_flags & REL_temp_ltt))
270+
if (!(relation->rel_flags & REL_ltt_created))
271271
MET_dsql_cache_use(tdbb, SYM_relation, name);
272272

273273
relation->rel_flags |= REL_dropped;

src/jrd/dfw.epp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5807,7 +5807,8 @@ static void get_trigger_dependencies(DeferredWork* work, bool compile, jrd_tra*
58075807
FOR(REQUEST_HANDLE handle)
58085808
X IN RDB$TRIGGERS
58095809
WITH X.RDB$SCHEMA_NAME EQ work->dfw_schema.c_str() AND
5810-
X.RDB$TRIGGER_NAME EQ work->dfw_name.c_str()
5810+
X.RDB$TRIGGER_NAME EQ work->dfw_name.c_str() AND
5811+
X.RDB$RELATION_NAME NOT MISSING
58115812
{
58125813
blob_id = X.RDB$TRIGGER_BLR;
58135814
type = (ISC_UINT64) X.RDB$TRIGGER_TYPE;

src/jrd/met.epp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3187,6 +3187,8 @@ jrd_rel* MET_lookup_relation(thread_db* tdbb, const QualifiedName& name)
31873187
}
31883188
}
31893189

3190+
relation = nullptr;
3191+
31903192
// We need to look up the relation name in RDB$RELATIONS
31913193

31923194
static const CachedRequestId request1CacheId;

0 commit comments

Comments
 (0)