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

Fixed CORE-980.

Browse Source
This commit is contained in:
dimitr 2006-10-30 19:04:27 +00:00
parent 581828e5c5
commit 1ce4eb2a2b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jrd/tra.cpp
View File

@ -91,7 +91,6 @@ static const SCHAR lock_types[] =
};
#endif /* VMS */
const int DEFAULT_LOCK_TIMEOUT = -1; // infinite
static const SLONG MAX_TRA_NUMBER = MAX_SLONG;
using namespace Jrd;
@ -757,7 +756,6 @@ void TRA_init(thread_db* tdbb)
jrd_tra* trans = FB_NEW_RPT(*dbb->dbb_permanent, 0) jrd_tra(*dbb->dbb_permanent);
dbb->dbb_sys_trans = trans;
trans->tra_lock_timeout = DEFAULT_LOCK_TIMEOUT;
trans->tra_flags |= TRA_system | TRA_ignore_limbo;
trans->tra_pool = dbb->dbb_permanent;
trans->tra_stats.setParent(&dbb->dbb_stats);
@ -995,7 +993,6 @@ jrd_tra* TRA_reconnect(thread_db* tdbb, const UCHAR* id, USHORT length)
jrd_tra* trans = FB_NEW_RPT(*tdbb->getDefaultPool(), 0) jrd_tra(*tdbb->getDefaultPool());
trans->tra_pool = tdbb->getDefaultPool();
trans->tra_number = gds__vax_integer(id, length);
trans->tra_lock_timeout = DEFAULT_LOCK_TIMEOUT;
trans->tra_flags |= TRA_prepared | TRA_reconnected | TRA_write;
const UCHAR state = limbo_transaction(tdbb, trans->tra_number);
@ -2837,7 +2834,6 @@ static void transaction_options(
if (*tpb != isc_tpb_version3 && *tpb != isc_tpb_version1)
ERR_post(isc_bad_tpb_form, isc_arg_gds, isc_wrotpbver, 0);
transaction->tra_lock_timeout = DEFAULT_LOCK_TIMEOUT;
bool wait = true, lock_timeout = false;
++tpb;

5
src/jrd/tra.h
View File

@ -80,6 +80,8 @@ typedef Firebird::BePlusTree<BlobIndex, ULONG, MemoryPool, BlobIndex> BlobIndexT
/* Transaction block */
const int DEFAULT_LOCK_TIMEOUT = -1; // infinite
class jrd_tra : public pool_alloc_rpt<SCHAR, type_tra>
{
public:
@ -93,7 +95,8 @@ class jrd_tra : public pool_alloc_rpt<SCHAR, type_tra>
tra_blobs(&p),
tra_resources(p),
tra_context_vars(p),
tra_stats(p)
tra_stats(p),
tra_lock_timeout(DEFAULT_LOCK_TIMEOUT)
{}
Attachment* tra_attachment; /* database attachment */