mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
Fix for bug#4650 Scan does not report timeout of owning transaction
This commit is contained in:
parent
49d6b187e4
commit
8e8a93df81
1 changed files with 7 additions and 0 deletions
|
@ -8502,6 +8502,13 @@ void Dbtc::execSCAN_TABREQ(Signal* signal)
|
|||
if ((transid1 == buddyApiPtr.p->transid[0]) &&
|
||||
(transid2 == buddyApiPtr.p->transid[1])) {
|
||||
jam();
|
||||
|
||||
if (buddyApiPtr.p->apiConnectstate == CS_ABORTING) {
|
||||
// transaction has timed out
|
||||
jam();
|
||||
errCode = ZTIME_OUT_ERROR;
|
||||
goto SCAN_TAB_error;
|
||||
}//if
|
||||
currSavePointId = buddyApiPtr.p->currSavePointId;
|
||||
buddyApiPtr.p->currSavePointId++;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue