diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-04-11 05:45:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:56 -0500 |
| commit | d9916ac98c6afc6e1ac60ba762c003c2315ad47e (patch) | |
| tree | d7ab655c382361c033cf67f49f15b3bc5b6320a9 | |
| parent | c41fe665e4a4229ec663f03093c2b6b1c4648b86 (diff) | |
| download | samba-d9916ac98c6afc6e1ac60ba762c003c2315ad47e.tar.gz samba-d9916ac98c6afc6e1ac60ba762c003c2315ad47e.tar.bz2 samba-d9916ac98c6afc6e1ac60ba762c003c2315ad47e.zip | |
r22165: merge transaction fix from samba3
(This used to be commit ff78be0be4ef67ed25bfb837bd8a7bf4105367fb)
| -rw-r--r-- | source4/lib/tdb/common/transaction.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/lib/tdb/common/transaction.c b/source4/lib/tdb/common/transaction.c index a592c66039..0a609af521 100644 --- a/source4/lib/tdb/common/transaction.c +++ b/source4/lib/tdb/common/transaction.c @@ -523,6 +523,8 @@ int tdb_transaction_cancel(struct tdb_context *tdb) F_UNLCK,F_SETLKW, 0, 1); } tdb->num_locks = 0; + tdb->num_lockrecs = 0; + SAFE_FREE(tdb->lockrecs); } /* restore the normal io methods */ |