diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2005-09-21 17:27:04 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2005-09-21 17:27:04 +0200 |
| commit | cf358493caceaaf7e5503e928ed4e6e40ef8e01f (patch) | |
| tree | c2abadf193a06ba87127d48d265ad952eeefa269 /ndb/src | |
| parent | 16328ca2159b40d88dc532e42c13e92499ee87e6 (diff) | |
| parent | 3c8a296f28b20e039994d6308c5fdbf181160929 (diff) | |
| download | mariadb-git-cf358493caceaaf7e5503e928ed4e6e40ef8e01f.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
merge
Diffstat (limited to 'ndb/src')
| -rw-r--r-- | ndb/src/kernel/blocks/backup/Backup.cpp | 1 | ||||
| -rw-r--r-- | ndb/src/kernel/blocks/dbtup/Dbtup.hpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/backup/Backup.cpp b/ndb/src/kernel/blocks/backup/Backup.cpp index 063e36a775f..cbffd6bcb6b 100644 --- a/ndb/src/kernel/blocks/backup/Backup.cpp +++ b/ndb/src/kernel/blocks/backup/Backup.cpp @@ -3262,6 +3262,7 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal) req->requestInfo = 0; req->savePointId = 0; req->tableId = table.tableId; + ScanFragReq::setReadCommittedFlag(req->requestInfo, 1); ScanFragReq::setLockMode(req->requestInfo, 0); ScanFragReq::setHoldLockFlag(req->requestInfo, 0); ScanFragReq::setKeyinfoFlag(req->requestInfo, 0); diff --git a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp index cf3c6056d65..7d85af9f138 100644 --- a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp +++ b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp @@ -1791,7 +1791,8 @@ private: Uint32* const mainBuffer, Uint32& noMainWords, Uint32* const copyBuffer, - Uint32& noCopyWords); + Uint32& noCopyWords, + bool xfrm); void sendTrigAttrInfo(Signal* signal, Uint32* data, |