Skip to content

Postfix for #8430 #8752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 5, 2025
Merged

Postfix for #8430 #8752

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
700f474
Fixed crash after calling incorrectly parametrized request
Ev3nt Jul 23, 2025
5e1ecff
Patch: Fixed crash after calling incorrectly parametrized request
Ev3nt Jul 24, 2025
22c7d12
Merge branch 'FirebirdSQL:v5.0-release' into v5.0-release
Ev3nt Sep 22, 2025
24c74e1
ALICE_print fix, isError flag added
Sep 22, 2025
c197530
Revert "ALICE_print fix, isError flag added"
Oct 30, 2025
1fa85b4
Fix incorrect order of procedure calls
Oct 30, 2025
c52b910
Merge branch 'FirebirdSQL:v5.0-release' into v5.0-release
Ev3nt Oct 30, 2025
9340a7b
`ALICE_print` was returned to previous state.
Ev3nt Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/alice/exe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ static const TEXT val_errors[] =
int EXE_action(const TEXT* database, const SINT64 switches)
{
bool error = false;
Firebird::AutoMemoryPool newPool(MemoryPool::createPool());
AliceGlobals* tdgbl = AliceGlobals::getSpecific();
{
AliceGlobals* tdgbl = AliceGlobals::getSpecific();
Firebird::AutoMemoryPool newPool(MemoryPool::createPool());
AliceContextPoolHolder context(tdgbl, newPool);

for (USHORT i = 0; i < MAX_VAL_ERRORS; i++)
Expand Down Expand Up @@ -130,6 +130,8 @@ int EXE_action(const TEXT* database, const SINT64 switches)
}
}

tdgbl->uSvc->started();

return error ? FINI_ERROR : FINI_OK;
}

Expand All @@ -141,9 +143,9 @@ int EXE_action(const TEXT* database, const SINT64 switches)
int EXE_two_phase(const TEXT* database, const SINT64 switches)
{
bool error = false;
Firebird::AutoMemoryPool newPool(MemoryPool::createPool());
AliceGlobals* tdgbl = AliceGlobals::getSpecific();
{
AliceGlobals* tdgbl = AliceGlobals::getSpecific();
Firebird::AutoMemoryPool newPool(MemoryPool::createPool());
AliceContextPoolHolder context(tdgbl, newPool);

for (USHORT i = 0; i < MAX_VAL_ERRORS; i++)
Expand All @@ -160,8 +162,6 @@ int EXE_two_phase(const TEXT* database, const SINT64 switches)
isc_attach_database(tdgbl->status, 0, database, &handle,
dpb.getBufferLength(), reinterpret_cast<const SCHAR*>(dpb.getBuffer()));

tdgbl->uSvc->started();

if (tdgbl->status[1])
{
error = true;
Expand All @@ -186,6 +186,8 @@ int EXE_two_phase(const TEXT* database, const SINT64 switches)
}
}

tdgbl->uSvc->started();

return (error ? FINI_ERROR : FINI_OK);
}

Expand Down
Loading