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

Simplified fix for CORE-980.

Browse Source
This commit is contained in:
dimitr 2006-10-30 19:07:32 +00:00
parent 5143dc3eb7
commit f15f2e6d1c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jrd/tra.cpp
View File

@ -1513,6 +1513,7 @@ jrd_tra* TRA_start(thread_db* tdbb, int tpb_length, const SCHAR* tpb)
Jrd::ContextPoolHolder context(tdbb, JrdMemoryPool::createPool());
jrd_tra* temp = FB_NEW_RPT(*tdbb->getDefaultPool(), 0) jrd_tra(*tdbb->getDefaultPool());
temp->tra_pool = tdbb->getDefaultPool();
temp->tra_lock_timeout = DEFAULT_LOCK_TIMEOUT;
transaction_options(tdbb, temp, reinterpret_cast<const UCHAR*>(tpb),
tpb_length);
@ -2805,7 +2806,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;