diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-06 22:57:35 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-06 22:57:35 -0800 |
| commit | 3809490dd0ceb902c002bfeff09e6c04946e1a0c (patch) | |
| tree | 115bfa178b8e55bd7229316e22a3849fac519366 /source3/lib/tdb/tools | |
| parent | d8f3c9d0786ff637241d2a9409e1c7c253715ba5 (diff) | |
| download | samba-3809490dd0ceb902c002bfeff09e6c04946e1a0c.tar.gz samba-3809490dd0ceb902c002bfeff09e6c04946e1a0c.tar.bz2 samba-3809490dd0ceb902c002bfeff09e6c04946e1a0c.zip | |
Keep the tdb code in sync with Samba4.
Mainly this is the svn changes :
------------------------------------------------------------------------
r23238 | tridge | 2007-05-30 01:15:49 -0700 (Wed, 30 May 2007) | 6 lines
merged transaction lock changes from ctdb
this ensures that having the global lock also implies the transaction
lock
------------------------------------------------------------------------
r22832 | tridge | 2007-05-13 18:00:06 -0700 (Sun, 13 May 2007) | 3 lines
merged the latest tdb changes from ctdb to Samba4
Jeremy.
(This used to be commit ab11c0055761e97ba32a8c3ec4fa6f8763a262cd)
Diffstat (limited to 'source3/lib/tdb/tools')
| -rw-r--r-- | source3/lib/tdb/tools/tdbtest.c | 2 | ||||
| -rw-r--r-- | source3/lib/tdb/tools/tdbtorture.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/tdb/tools/tdbtest.c b/source3/lib/tdb/tools/tdbtest.c index 1564a42bc4..416bc50a5b 100644 --- a/source3/lib/tdb/tools/tdbtest.c +++ b/source3/lib/tdb/tools/tdbtest.c @@ -214,7 +214,7 @@ static void merge_test(void) key.dptr = keys[3]; tdb_delete(db, key); } - + int main(int argc, const char *argv[]) { int i, seed=0; diff --git a/source3/lib/tdb/tools/tdbtorture.c b/source3/lib/tdb/tools/tdbtorture.c index 14a2b48cdc..ca71c736ad 100644 --- a/source3/lib/tdb/tools/tdbtorture.c +++ b/source3/lib/tdb/tools/tdbtorture.c @@ -238,7 +238,7 @@ static void usage(void) unlink("torture.tdb"); - pids = calloc(sizeof(pid_t), num_procs); + pids = (pid_t *)calloc(sizeof(pid_t), num_procs); pids[0] = getpid(); for (i=0;i<num_procs-1;i++) { |