2 ===================================================================
\r
3 RCS file: /var/CVSROOT/bdb42/dbinc/db.in,v
\r
4 retrieving revision 1.1.1.1
\r
5 retrieving revision 1.2
\r
6 diff -u -r1.1.1.1 -r1.2
\r
7 --- dbinc/db.in 25 Nov 2003 21:58:02 -0000 1.1.1.1
\r
8 +++ dbinc/db.in 17 Jul 2004 16:07:23 -0000 1.2
\r
10 #define TXN_NOWAIT 0x040 /* Do not wait on locks. */
\r
11 #define TXN_RESTORED 0x080 /* Transaction has been restored. */
\r
12 #define TXN_SYNC 0x100 /* Sync on prepare and commit. */
\r
13 +#define TXN_NOLOG 0x200 /* Do not log this transaction. */
\r
18 ===================================================================
\r
19 RCS file: /var/CVSROOT/bdb42/txn/txn.c,v
\r
20 retrieving revision 1.1.1.2
\r
21 retrieving revision 1.2
\r
22 diff -u -r1.1.1.2 -r1.2
\r
23 --- txn/txn.c 17 Dec 2003 21:43:53 -0000 1.1.1.2
\r
24 +++ txn/txn.c 17 Jul 2004 16:07:27 -0000 1.2
\r
26 if ((ret = __db_fchk(dbenv,
\r
28 DB_DIRTY_READ | DB_TXN_NOWAIT |
\r
29 - DB_TXN_NOSYNC | DB_TXN_SYNC)) != 0)
\r
30 + DB_TXN_NOSYNC | DB_TXN_SYNC | DB_TXN_NOT_DURABLE)) != 0)
\r
32 if ((ret = __db_fcchk(dbenv,
\r
33 "txn_begin", flags, DB_TXN_NOSYNC, DB_TXN_SYNC)) != 0)
\r
35 F_SET(txn, TXN_SYNC);
\r
36 if (LF_ISSET(DB_TXN_NOWAIT))
\r
37 F_SET(txn, TXN_NOWAIT);
\r
38 + if (LF_ISSET(DB_TXN_NOT_DURABLE))
\r
39 + F_SET(txn, TXN_NOLOG);
\r
41 if ((ret = __txn_begin_int(txn, 0)) != 0)
\r
44 * We should set this value when we write the first log record, not
\r
47 - if (DBENV_LOGGING(dbenv))
\r
48 + if (DBENV_LOGGING(dbenv) && !F_ISSET(txn, TXN_NOLOG))
\r
49 __log_txn_lsn(dbenv, &begin_lsn, NULL, NULL);
\r
51 ZERO_LSN(begin_lsn);
\r