mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
This commit is contained in:
commit
770e48fca7
1 changed files with 2 additions and 2 deletions
|
@ -1146,7 +1146,7 @@ HugoTransactions::pkInterpretedUpdateRecords(Ndb* pNdb,
|
|||
}
|
||||
|
||||
// PKs
|
||||
if (equalForRow(pOp, r) != 0)
|
||||
if (equalForRow(pUpdOp, r) != 0)
|
||||
{
|
||||
closeTransaction(pNdb);
|
||||
return NDBT_FAILED;
|
||||
|
@ -1714,7 +1714,7 @@ HugoTransactions::indexUpdateRecords(Ndb* pNdb,
|
|||
|
||||
if(!ordered)
|
||||
{
|
||||
if (equalForRow(pOp, r+b) != 0)
|
||||
if (equalForRow(pUpdOp, r+b) != 0)
|
||||
{
|
||||
closeTransaction(pNdb);
|
||||
return NDBT_FAILED;
|
||||
|
|
Loading…
Add table
Reference in a new issue