@@ -114,7 +114,7 @@ static int blocking_ast_relation(void*);
114
114
static int partners_ast_relation(void*);
115
115
static int rescan_ast_relation(void*);
116
116
static 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 ,
118
118
USHORT, const MetaName&, const string&, const bid*, Nullable<bool> ssDefiner);
119
119
static bool get_type(thread_db*, USHORT*, const UCHAR*, const TEXT*);
120
120
static void lookup_view_contexts(thread_db*, jrd_rel*);
@@ -123,7 +123,7 @@ static ValueExprNode* parse_field_default_blr(thread_db* tdbb, bid* blob_id);
123
123
static BoolExprNode* parse_field_validation_blr(thread_db* tdbb, bid* blob_id, const MetaName name);
124
124
static bool resolve_charset_and_collation(thread_db*, USHORT*, const UCHAR*, const UCHAR*);
125
125
static 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&,
127
127
const bid*, Nullable<bool> ssDefiner);
128
128
static void scan_partners(thread_db*, jrd_rel*);
129
129
static void store_dependencies(thread_db*, CompilerScratch*, const jrd_rel*,
@@ -2044,7 +2044,7 @@ void MET_load_trigger(thread_db* tdbb,
2044
2044
triggers,
2045
2045
TRG.RDB$TRIGGER_NAME,
2046
2046
TRG.RDB$TRIGGER_TYPE & ~TRIGGER_TYPE_MASK,
2047
- (bool) TRG.RDB$SYSTEM_FLAG,
2047
+ TRG.RDB$SYSTEM_FLAG,
2048
2048
trig_flags,
2049
2049
engine,
2050
2050
entryPoint,
@@ -2065,7 +2065,7 @@ void MET_load_trigger(thread_db* tdbb,
2065
2065
triggers + trigger_action,
2066
2066
TRG.RDB$TRIGGER_NAME,
2067
2067
(UCHAR) trigger_action,
2068
- (bool) TRG.RDB$SYSTEM_FLAG,
2068
+ TRG.RDB$SYSTEM_FLAG,
2069
2069
trig_flags,
2070
2070
engine,
2071
2071
entryPoint,
@@ -3251,7 +3251,7 @@ void MET_parse_sys_trigger(thread_db* tdbb, jrd_rel* relation)
3251
3251
if (trig_flags & TRG_ignore_perm)
3252
3252
statement->flags |= JrdStatement::FLAG_IGNORE_PERM;
3253
3253
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, "",
3255
3255
"", NULL, Nullable<bool>());
3256
3256
}
3257
3257
}
@@ -4601,7 +4601,7 @@ ULONG MET_get_rel_flags_from_TYPE(USHORT type)
4601
4601
static void get_trigger(thread_db* tdbb, jrd_rel* relation,
4602
4602
bid* blob_id, bid* debug_blob_id, TrigVector** ptr,
4603
4603
const TEXT* name, FB_UINT64 type,
4604
- bool sys_trigger, USHORT flags,
4604
+ SSHORT sys_trigger, USHORT flags,
4605
4605
const MetaName& engine, const string& entryPoint,
4606
4606
const bid* body, Nullable<bool> ssDefiner)
4607
4607
{
@@ -4983,7 +4983,7 @@ static bool resolve_charset_and_collation(thread_db* tdbb,
4983
4983
static void save_trigger_data(thread_db* tdbb, TrigVector** ptr, jrd_rel* relation,
4984
4984
JrdStatement* statement, blb* blrBlob, blb* debugInfoBlob,
4985
4985
const TEXT* name, FB_UINT64 type,
4986
- bool sys_trigger, USHORT flags,
4986
+ SSHORT sys_trigger, USHORT flags,
4987
4987
const MetaName& engine, const string& entryPoint,
4988
4988
const bid* body, Nullable<bool> ssDefiner)
4989
4989
{
0 commit comments