paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 16:59:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug ID #0035246

Browse Source 
git-svn-id: trunk@42944 -
This commit is contained in:
michael 2019-09-08 10:00:22 +00:00
parent 16fc8c8d9a
commit 47dbaafa89
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fcl-db/src/sqldb/sqldb.pp
View File

@ -2230,7 +2230,8 @@ begin
CloseDataSets; CloseDataSets;
If LogEvent(detCommit) then If LogEvent(detCommit) then
Log(detCommit,SCommitting); Log(detCommit,SCommitting);
if (stoUseImplicit in Options) or SQLConnection.AttemptCommit(FTrans) then // FTrans=Nil for the case of forced close.
if (FTrans=Nil) or (stoUseImplicit in Options) or SQLConnection.AttemptCommit(FTrans) then
begin begin
CloseTrans; CloseTrans;
FreeAndNil(FTrans); FreeAndNil(FTrans);
@ -2257,7 +2258,8 @@ begin
CloseDataSets; CloseDataSets;
If LogEvent(detRollback) then If LogEvent(detRollback) then
Log(detRollback,SRollingBack); Log(detRollback,SRollingBack);
if SQLConnection.AttemptRollBack(FTrans) then // FTrans=Nil for the case of forced close.
if (FTrans=Nil) or SQLConnection.AttemptRollBack(FTrans) then
begin begin
CloseTrans; CloseTrans;
FreeAndNil(FTrans); FreeAndNil(FTrans);