Commit 2043252d authored by joreland@mysql.com's avatar joreland@mysql.com

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1
parents 2f9a28b4 f60992de
...@@ -443,6 +443,7 @@ Dbtup::commitRecord(Signal* signal, ...@@ -443,6 +443,7 @@ Dbtup::commitRecord(Signal* signal,
saveAttributeMask.bitOR(befOpPtr.p->changeMask); saveAttributeMask.bitOR(befOpPtr.p->changeMask);
befOpPtr.p->changeMask.clear(); befOpPtr.p->changeMask.clear();
befOpPtr.p->changeMask.bitOR(attributeMask); befOpPtr.p->changeMask.bitOR(attributeMask);
befOpPtr.p->gci = regOperPtr->gci;
operPtr.p = befOpPtr.p; operPtr.p = befOpPtr.p;
checkDetachedTriggers(signal, checkDetachedTriggers(signal,
...@@ -480,6 +481,7 @@ Dbtup::commitRecord(Signal* signal, ...@@ -480,6 +481,7 @@ Dbtup::commitRecord(Signal* signal,
befOpPtr.p->pageOffset = befOpPtr.p->pageOffsetC; befOpPtr.p->pageOffset = befOpPtr.p->pageOffsetC;
befOpPtr.p->fragPageId = befOpPtr.p->fragPageIdC; befOpPtr.p->fragPageId = befOpPtr.p->fragPageIdC;
befOpPtr.p->pageIndex = befOpPtr.p->pageIndexC; befOpPtr.p->pageIndex = befOpPtr.p->pageIndexC;
befOpPtr.p->gci = regOperPtr->gci;
operPtr.p = befOpPtr.p; operPtr.p = befOpPtr.p;
checkDetachedTriggers(signal, checkDetachedTriggers(signal,
......
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