mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
This commit is contained in:
commit
770813b5a6
1 changed files with 4 additions and 0 deletions
|
@ -2976,6 +2976,8 @@ void Dbdih::execCOPY_FRAGREF(Signal* signal)
|
|||
SystemError * const sysErr = (SystemError*)&signal->theData[0];
|
||||
sysErr->errorCode = SystemError::CopyFragRefError;
|
||||
sysErr->errorRef = reference();
|
||||
sysErr->data1 = errorCode;
|
||||
sysErr->data2 = 0;
|
||||
sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal,
|
||||
SystemError::SignalLength, JBB);
|
||||
return;
|
||||
|
@ -4492,6 +4494,8 @@ void Dbdih::handleTakeOverNewMaster(Signal* signal, Uint32 takeOverPtrI)
|
|||
SystemError * const sysErr = (SystemError*)&signal->theData[0];
|
||||
sysErr->errorCode = SystemError::CopyFragRefError;
|
||||
sysErr->errorRef = reference();
|
||||
sysErr->data1= 0;
|
||||
sysErr->data2= __LINE__;
|
||||
sendSignal(cntrRef, GSN_SYSTEM_ERROR, signal,
|
||||
SystemError::SignalLength, JBB);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue