exe.h (Firebird-3.0.2.32703-0.tar.bz2) | : | exe.h (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 477 | skipping to change at line 477 | |||
StreamType nextStream(bool check = true) | StreamType nextStream(bool check = true) | |||
{ | { | |||
if (csb_n_stream >= MAX_STREAMS && check) | if (csb_n_stream >= MAX_STREAMS && check) | |||
{ | { | |||
ERR_post(Firebird::Arg::Gds(isc_too_many_contexts)); | ERR_post(Firebird::Arg::Gds(isc_too_many_contexts)); | |||
} | } | |||
return csb_n_stream++; | return csb_n_stream++; | |||
} | } | |||
void inheritViewFlags(StreamType stream, USHORT flags) | ||||
{ | ||||
if (csb_view) | ||||
{ | ||||
csb_rpt[stream].csb_flags |= csb_rpt[csb_view_stream].csb | ||||
_flags & flags; | ||||
} | ||||
} | ||||
#ifdef CMP_DEBUG | #ifdef CMP_DEBUG | |||
void dump(const char* format, ...) | void dump(const char* format, ...) | |||
{ | { | |||
va_list params; | va_list params; | |||
va_start(params, format); | va_start(params, format); | |||
Firebird::string s; | Firebird::string s; | |||
s.vprintf(format, params); | s.vprintf(format, params); | |||
va_end(params); | va_end(params); | |||
skipping to change at line 615 | skipping to change at line 623 | |||
const int csb_used = 2; // context has already be en defined (BLR parsing only) | const int csb_used = 2; // context has already be en defined (BLR parsing only) | |||
const int csb_view_update = 4; // view update w/wo trigger is in progress | const int csb_view_update = 4; // view update w/wo trigger is in progress | |||
const int csb_trigger = 8; // NEW or OLD context in trigger | const int csb_trigger = 8; // NEW or OLD context in trigger | |||
const int csb_no_dbkey = 16; // stream doesn't have a dbkey | const int csb_no_dbkey = 16; // stream doesn't have a dbkey | |||
const int csb_store = 32; // we are processing a st ore statement | const int csb_store = 32; // we are processing a st ore statement | |||
const int csb_modify = 64; // we are processing a modify | const int csb_modify = 64; // we are processing a modify | |||
const int csb_sub_stream = 128; // a sub-stream of the RSE being processed | const int csb_sub_stream = 128; // a sub-stream of the RSE being processed | |||
const int csb_erase = 256; // we are processing an e rase | const int csb_erase = 256; // we are processing an e rase | |||
const int csb_unmatched = 512; // stream has conjuncts u nmatched by any index | const int csb_unmatched = 512; // stream has conjuncts u nmatched by any index | |||
const int csb_update = 1024; // erase or modify for relation | const int csb_update = 1024; // erase or modify for relation | |||
const int csb_unstable = 2048; // unstable explicit cursor | ||||
inline void CompilerScratch::csb_repeat::activate() | inline void CompilerScratch::csb_repeat::activate() | |||
{ | { | |||
csb_flags |= csb_active; | csb_flags |= csb_active; | |||
} | } | |||
inline void CompilerScratch::csb_repeat::deactivate() | inline void CompilerScratch::csb_repeat::deactivate() | |||
{ | { | |||
csb_flags &= ~csb_active; | csb_flags &= ~csb_active; | |||
} | } | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 10 lines changed or added |