[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.0-ctdb-4-3-g425c5b4

[Michael Adam]

The branch, v3-4-ctdb has been updated
       via  425c5b479bb92c4fcb50f0d91587d059f7082056 (commit)
      from  4d64ca1f39fcc58d95c86349451d17e711643992 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


- Log -----------------------------------------------------------------
commit 425c5b479bb92c4fcb50f0d91587d059f7082056
Author: Michael Adam <obnox at samba.org>
Date:   Fri Sep 11 13:23:34 2009 +0200

    s3:dbwrap_ctdb: set dmaster in ctdb_transaction_store() also when updating an existing record
    
    not only when creating a record.
    
    This matches commit e9194a130327d6b05a8ab90bd976475b0e93b06d from ctdb-master.
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/dbwrap_ctdb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 4a5bf6d..f492d5f 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -469,7 +469,6 @@ static int db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h,
 		   This is only safe because we are in a transaction and this
 		   is a persistent database */
 		ZERO_STRUCT(header);
-		header.dmaster = get_my_vnn();
 	} else {
 		memcpy(&header, rec.dptr, sizeof(struct ctdb_ltdb_header));
 		rec.dsize -= sizeof(struct ctdb_ltdb_header);
@@ -483,6 +482,7 @@ static int db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h,
 		SAFE_FREE(rec.dptr);
 	}
 
+	header.dmaster = get_my_vnn();
 	header.rsn++;
 
 	if (!h->in_replay) {


-- 
SAMBA-CTDB repository