diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-12 11:15:38 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-12 11:15:38 +1000 |
| commit | fe36b8af64195f10acead12d4a4f426cc8772a8c (patch) | |
| tree | af98810b529728d46a10f0ac1e2d3203b63323a2 /source3/lib | |
| parent | 51fd80647de9cb531181eb1eeefe9ad2c473f784 (diff) | |
| parent | bbc0a56da59df8b7cd6f19f99cfaac9c3909779f (diff) | |
| download | samba-fe36b8af64195f10acead12d4a4f426cc8772a8c.tar.gz samba-fe36b8af64195f10acead12d4a4f426cc8772a8c.tar.bz2 samba-fe36b8af64195f10acead12d4a4f426cc8772a8c.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/dbwrap_ctdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c index e38f76fcf6..07dde1e408 100644 --- a/source3/lib/dbwrap_ctdb.c +++ b/source3/lib/dbwrap_ctdb.c @@ -478,7 +478,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); @@ -492,6 +491,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) { |