8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 07:23:03 +01:00
This commit is contained in:
robocop 2012-01-17 06:20:36 +00:00
parent e724a3bf94
commit 7d014142ba
3 changed files with 3 additions and 2 deletions

View File

@ -1702,7 +1702,7 @@ void DYN_delete_role( Global* gbl, const UCHAR** ptr)
break; break;
case DEL_R_FAIL_SYSTEM: case DEL_R_FAIL_SYSTEM:
DYN_error_punt(false, 284, SafeArg() << role_name.c_str()); DYN_error_punt(false, 284, SafeArg() << role_name.c_str());
// msg 284: can not drop system SQL role @1 // msg 284: cannot drop system SQL role @1
break; break;
} }
} }

View File

@ -997,7 +997,7 @@ const int SECS_PER_DAY = SECS_PER_HOUR * 24;
class CleanupTraceHandles class CleanupTraceHandles
{ {
public: public:
CleanupTraceHandles(Firebird::MemoryPool&) explicit CleanupTraceHandles(Firebird::MemoryPool&)
{}; {};
~CleanupTraceHandles() ~CleanupTraceHandles()

View File

@ -6020,6 +6020,7 @@ static RecordSource* gen_union(thread_db* tdbb,
stream_array_t inner_streams; stream_array_t inner_streams;
inner_streams[0] = nstreams; inner_streams[0] = nstreams;
fb_assert(nstreams <= MAX_STREAMS);
memcpy(inner_streams + 1, streams, nstreams); memcpy(inner_streams + 1, streams, nstreams);
jrd_nod* clauses = union_node->nod_arg[e_uni_clauses]; jrd_nod* clauses = union_node->nod_arg[e_uni_clauses];