diff options
| author | unknown <joreland@mysql.com> | 2005-05-09 20:28:55 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-05-09 20:28:55 +0200 |
| commit | 6748f7f42fe8d18a5e73202810a4bff1bb0917ec (patch) | |
| tree | 4efdbcf0ba092934280facdcb971abd6737d5eda /ndb | |
| parent | 438eeda64a8f9d7c81c78ac0be37d0f140a1760e (diff) | |
| parent | 50a051bbc27133f90349ec9f5f7ec30e6a91b267 (diff) | |
| download | mariadb-git-6748f7f42fe8d18a5e73202810a4bff1bb0917ec.tar.gz | |
merge
include/my_global.h:
Auto merged
ndb/src/cw/cpcd/Process.cpp:
Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_udf.h:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp index cbd56c3281f..470b98fd04c 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp @@ -443,6 +443,7 @@ Dbtup::commitRecord(Signal* signal, saveAttributeMask.bitOR(befOpPtr.p->changeMask); befOpPtr.p->changeMask.clear(); befOpPtr.p->changeMask.bitOR(attributeMask); + befOpPtr.p->gci = regOperPtr->gci; operPtr.p = befOpPtr.p; checkDetachedTriggers(signal, @@ -480,6 +481,7 @@ Dbtup::commitRecord(Signal* signal, befOpPtr.p->pageOffset = befOpPtr.p->pageOffsetC; befOpPtr.p->fragPageId = befOpPtr.p->fragPageIdC; befOpPtr.p->pageIndex = befOpPtr.p->pageIndexC; + befOpPtr.p->gci = regOperPtr->gci; operPtr.p = befOpPtr.p; checkDetachedTriggers(signal, |