firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 02:03:03 +01:00
Code Issues

Misc

Browse Source
This commit is contained in:
asfernandes 2008-05-13 01:29:38 +00:00
parent 18dc9bc7cb
commit ee7a3f5930
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/isql/isql.epp
View File

@ -8103,9 +8103,9 @@ static int process_statement(const TEXT* string,
* This function now returns CONT (success) or ps_ERR. * This function now returns CONT (success) or ps_ERR.
**************************************/ **************************************/
// Here we actively use the fact that fb_cancel_enable/disable commands may be send many times. // Here we actively use the fact that fb_cancel_enable/disable commands may be send many times.
// They are ignored if cancel already has requested state. This let's us disable cancel // They are ignored if cancel already has requested state. This let's us disable cancel
// in the middle of processing, but do not care about special scope for CancelHolder variable. // in the middle of processing, but do not care about special scope for CancelHolder variable.
class CancelHolder class CancelHolder
{ {
public: public:

7
src/jrd/Relation.h
View File

@ -42,13 +42,14 @@ public:
{ {
} }
const Firebird::string vcx_context_name;
const Firebird::MetaName vcx_relation_name;
const USHORT vcx_context;
static const USHORT generate(const void*, const ViewContext* vc) static const USHORT generate(const void*, const ViewContext* vc)
{ {
return vc->vcx_context; return vc->vcx_context;
} }
const Firebird::string vcx_context_name;
const Firebird::MetaName vcx_relation_name;
const USHORT vcx_context;
}; };
typedef Firebird::SortedArray<ViewContext*, Firebird::EmptyStorage<ViewContext*>, typedef Firebird::SortedArray<ViewContext*, Firebird::EmptyStorage<ViewContext*>,

6
src/jrd/met.epp
View File

@ -4491,11 +4491,11 @@ static void lookup_view_contexts( thread_db* tdbb, jrd_rel* view)
REQUEST(irq_view_context) = request; REQUEST(irq_view_context) = request;
// trim trailing spaces // trim trailing spaces
fb_utils::exact_name_limit(V.RDB$CONTEXT_NAME, fb_utils::exact_name_limit(V.RDB$CONTEXT_NAME,
sizeof(V.RDB$CONTEXT_NAME)); sizeof(V.RDB$CONTEXT_NAME));
ViewContext *view_context = FB_NEW(*dbb->dbb_permanent) ViewContext* view_context = FB_NEW(*dbb->dbb_permanent)
ViewContext(*dbb->dbb_permanent, ViewContext(*dbb->dbb_permanent,
V.RDB$CONTEXT_NAME, V.RDB$CONTEXT_NAME,
V.RDB$RELATION_NAME, V.RDB$RELATION_NAME,
V.RDB$VIEW_CONTEXT); V.RDB$VIEW_CONTEXT);

2
src/jrd/que.h
View File

@ -35,7 +35,7 @@ struct que
struct que* que_backward; struct que* que_backward;
}; };
typedef que *QUE; typedef que* QUE;

1
src/remote/server.cpp
View File

@ -5223,6 +5223,7 @@ SSHORT rem_port::asyncReceive(PACKET* asyncPacket, const UCHAR* buffer, SSHORT d
// xdr packet fits into network packet. // xdr packet fits into network packet.
port_async_receive->receive(asyncPacket); port_async_receive->receive(asyncPacket);
} }
SSHORT asyncSize = dataSize - port_async_receive->port_receive.x_handy; SSHORT asyncSize = dataSize - port_async_receive->port_receive.x_handy;
switch(asyncPacket->p_operation) switch(asyncPacket->p_operation)