@@ -114,7 +114,7 @@ static int blocking_ast_relation(void*);
114114static int partners_ast_relation(void*);
115115static int rescan_ast_relation(void*);
116116static ULONG get_rel_flags_from_FLAGS(USHORT);
117- static void get_trigger(thread_db*, jrd_rel*, bid*, bid*, TrigVector**, const TEXT*, FB_UINT64, bool ,
117+ static void get_trigger(thread_db*, jrd_rel*, bid*, bid*, TrigVector**, const TEXT*, FB_UINT64, SSHORT ,
118118 USHORT, const MetaName&, const string&, const bid*, Nullable<bool> ssDefiner);
119119static bool get_type(thread_db*, USHORT*, const UCHAR*, const TEXT*);
120120static void lookup_view_contexts(thread_db*, jrd_rel*);
@@ -123,7 +123,7 @@ static ValueExprNode* parse_field_default_blr(thread_db* tdbb, bid* blob_id);
123123static BoolExprNode* parse_field_validation_blr(thread_db* tdbb, bid* blob_id, const MetaName name);
124124static bool resolve_charset_and_collation(thread_db*, USHORT*, const UCHAR*, const UCHAR*);
125125static void save_trigger_data(thread_db*, TrigVector**, jrd_rel*, JrdStatement*, blb*, blb*,
126- const TEXT*, FB_UINT64, bool , USHORT, const MetaName&, const string&,
126+ const TEXT*, FB_UINT64, SSHORT , USHORT, const MetaName&, const string&,
127127 const bid*, Nullable<bool> ssDefiner);
128128static void scan_partners(thread_db*, jrd_rel*);
129129static void store_dependencies(thread_db*, CompilerScratch*, const jrd_rel*,
@@ -2044,7 +2044,7 @@ void MET_load_trigger(thread_db* tdbb,
20442044 triggers,
20452045 TRG.RDB$TRIGGER_NAME,
20462046 TRG.RDB$TRIGGER_TYPE & ~TRIGGER_TYPE_MASK,
2047- (bool) TRG.RDB$SYSTEM_FLAG,
2047+ TRG.RDB$SYSTEM_FLAG,
20482048 trig_flags,
20492049 engine,
20502050 entryPoint,
@@ -2065,7 +2065,7 @@ void MET_load_trigger(thread_db* tdbb,
20652065 triggers + trigger_action,
20662066 TRG.RDB$TRIGGER_NAME,
20672067 (UCHAR) trigger_action,
2068- (bool) TRG.RDB$SYSTEM_FLAG,
2068+ TRG.RDB$SYSTEM_FLAG,
20692069 trig_flags,
20702070 engine,
20712071 entryPoint,
@@ -3251,7 +3251,7 @@ void MET_parse_sys_trigger(thread_db* tdbb, jrd_rel* relation)
32513251 if (trig_flags & TRG_ignore_perm)
32523252 statement->flags |= JrdStatement::FLAG_IGNORE_PERM;
32533253
3254- save_trigger_data(tdbb, ptr, relation, statement, NULL, NULL, NULL, type, true , 0, "",
3254+ save_trigger_data(tdbb, ptr, relation, statement, NULL, NULL, NULL, type, TRG.RDB$SYSTEM_FLAG , 0, "",
32553255 "", NULL, Nullable<bool>());
32563256 }
32573257 }
@@ -4601,7 +4601,7 @@ ULONG MET_get_rel_flags_from_TYPE(USHORT type)
46014601static void get_trigger(thread_db* tdbb, jrd_rel* relation,
46024602 bid* blob_id, bid* debug_blob_id, TrigVector** ptr,
46034603 const TEXT* name, FB_UINT64 type,
4604- bool sys_trigger, USHORT flags,
4604+ SSHORT sys_trigger, USHORT flags,
46054605 const MetaName& engine, const string& entryPoint,
46064606 const bid* body, Nullable<bool> ssDefiner)
46074607{
@@ -4983,7 +4983,7 @@ static bool resolve_charset_and_collation(thread_db* tdbb,
49834983static void save_trigger_data(thread_db* tdbb, TrigVector** ptr, jrd_rel* relation,
49844984 JrdStatement* statement, blb* blrBlob, blb* debugInfoBlob,
49854985 const TEXT* name, FB_UINT64 type,
4986- bool sys_trigger, USHORT flags,
4986+ SSHORT sys_trigger, USHORT flags,
49874987 const MetaName& engine, const string& entryPoint,
49884988 const bid* body, Nullable<bool> ssDefiner)
49894989{
0 commit comments