1 --- storage/ovdb/ovdb-private.h.orig 2003-05-09 04:25:27.000000000 +0000
2 +++ storage/ovdb/ovdb-private.h 2003-12-04 18:03:59.000000000 +0000
4 #define TXN_START(label, tid) \
7 - txn_ret = txn_begin(OVDBenv->tx_info, NULL, &tid); \
8 + txn_ret = OVDBenv->tx_info->txn_begin(OVDBenv->tx_info, NULL, &tid); \
10 syslog(L_ERROR, "OVDB: " #label " txn_begin: %s", db_strerror(ret)); \
15 #define TXN_RETRY(label, tid) \
16 -{ txn_abort(tid); goto label; }
17 +{ tid->abort(tid); goto label; }
19 -#define TXN_ABORT(label, tid) txn_abort(tid)
20 -#define TXN_COMMIT(label, tid) txn_commit(tid)
21 +#define TXN_ABORT(label, tid) tid->abort(tid)
22 +#define TXN_COMMIT(label, tid) tid->commit(tid)
24 #define TRYAGAIN EAGAIN
27 #define TXN_START(label, tid) \
30 - txn_ret = txn_begin(OVDBenv, NULL, &tid, 0); \
31 + txn_ret = OVDBenv->txn_begin(OVDBenv, NULL, &tid, 0); \
33 syslog(L_ERROR, "OVDB: " #label " txn_begin: %s", db_strerror(ret)); \
38 #define TXN_RETRY(label, tid) \
39 -{ txn_abort(tid); goto label; }
40 +{ tid->abort(tid); goto label; }
42 -#define TXN_ABORT(label, tid) txn_abort(tid)
43 -#define TXN_COMMIT(label, tid) txn_commit(tid, 0)
44 +#define TXN_ABORT(label, tid) tid->abort(tid)
45 +#define TXN_COMMIT(label, tid) tid->commit(tid, 0)
47 #define TRYAGAIN DB_LOCK_DEADLOCK