diff options
| author | unknown <joreland@mysql.com> | 2005-05-09 21:13:27 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-05-09 21:13:27 +0200 |
| commit | aa80c3a4be3623946cad9c5a4729723bf515b27e (patch) | |
| tree | 2d0c654ec96c8b040e7eb5fc1c145ad19ff78824 /ndb/src/kernel/blocks/dbtup | |
| parent | 130f14dbed4afd2f9698d04da51395942b3523ba (diff) | |
| parent | 6748f7f42fe8d18a5e73202810a4bff1bb0917ec (diff) | |
| download | mariadb-git-aa80c3a4be3623946cad9c5a4729723bf515b27e.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'ndb/src/kernel/blocks/dbtup')
| -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, |