mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 22:43:03 +01:00
Misc.
This commit is contained in:
parent
350a491865
commit
abea0e695d
@ -55,7 +55,7 @@ public:
|
||||
{
|
||||
bufSize = size;
|
||||
bufAligned = buffer.getBuffer(bufSize + SYS_PAGE_SIZE);
|
||||
bufAligned = (char*) FB_ALIGN((U_IPTR)bufAligned, SYS_PAGE_SIZE);
|
||||
bufAligned = (char*) FB_ALIGN((U_IPTR) bufAligned, SYS_PAGE_SIZE);
|
||||
memset(bufAligned, 0, size);
|
||||
}
|
||||
|
||||
|
@ -776,7 +776,8 @@ void DFW_perform_work(thread_db* tdbb, jrd_tra* transaction)
|
||||
++phase;
|
||||
tdbb->tdbb_flags &= ~(TDBB_dont_post_dfw | TDBB_use_db_page_space);
|
||||
}
|
||||
catch (const Firebird::Exception& ex) {
|
||||
catch (const Firebird::Exception& ex)
|
||||
{
|
||||
tdbb->tdbb_flags &= ~(TDBB_dont_post_dfw | TDBB_use_db_page_space);
|
||||
|
||||
// Do any necessary cleanup
|
||||
@ -786,9 +787,8 @@ void DFW_perform_work(thread_db* tdbb, jrd_tra* transaction)
|
||||
ERR_punt();
|
||||
}
|
||||
else
|
||||
{
|
||||
ex.stuff_exception(err_status);
|
||||
}
|
||||
|
||||
phase = 0;
|
||||
more = true;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user