Commit ac02b2e1 authored by mskold@mysql.com's avatar mskold@mysql.com

Fix for bug#4650 Scan does not report timeout of owning transaction

parent 6082f484
......@@ -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++;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment