upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove EOF garbage

Browse source 
Add comment
This commit is contained in:
Kurt Zeilenga 2005-03-20 21:16:57 +00:00
parent 7685223bb9
commit 06c127a28c
1 changed files with 55 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
build/BerkeleyDB42.patch
View file

@ -1,51 +1,55 @@
Index: dbinc/db.in This patch is intended to be applied to Berkeley DB 4.2 and,
=================================================================== if applied, will automatically be used by slapd(8) back-bdb/hdb.
RCS file: /var/CVSROOT/bdb42/dbinc/db.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2 Index: dbinc/db.in
diff -u -r1.1.1.1 -r1.2 ===================================================================
--- dbinc/db.in 25 Nov 2003 21:58:02 -0000 1.1.1.1 RCS file: /var/CVSROOT/bdb42/dbinc/db.in,v
+++ dbinc/db.in 17 Jul 2004 16:07:23 -0000 1.2 retrieving revision 1.1.1.1
@@ -839,6 +839,7 @@ retrieving revision 1.2
#define TXN_NOWAIT 0x040 /* Do not wait on locks. */ diff -u -r1.1.1.1 -r1.2
#define TXN_RESTORED 0x080 /* Transaction has been restored. */ --- dbinc/db.in 25 Nov 2003 21:58:02 -0000 1.1.1.1
#define TXN_SYNC 0x100 /* Sync on prepare and commit. */ +++ dbinc/db.in 17 Jul 2004 16:07:23 -0000 1.2
+#define TXN_NOLOG 0x200 /* Do not log this transaction. */ @@ -839,6 +839,7 @@
u_int32_t flags; #define TXN_NOWAIT 0x040 /* Do not wait on locks. */
}; #define TXN_RESTORED 0x080 /* Transaction has been restored. */
#define TXN_SYNC 0x100 /* Sync on prepare and commit. */
Index: txn/txn.c +#define TXN_NOLOG 0x200 /* Do not log this transaction. */
=================================================================== u_int32_t flags;
RCS file: /var/CVSROOT/bdb42/txn/txn.c,v };
retrieving revision 1.1.1.2
retrieving revision 1.2 Index: txn/txn.c
diff -u -r1.1.1.2 -r1.2 ===================================================================
--- txn/txn.c 17 Dec 2003 21:43:53 -0000 1.1.1.2 RCS file: /var/CVSROOT/bdb42/txn/txn.c,v
+++ txn/txn.c 17 Jul 2004 16:07:27 -0000 1.2 retrieving revision 1.1.1.2
@@ -127,7 +127,7 @@ retrieving revision 1.2
if ((ret = __db_fchk(dbenv, diff -u -r1.1.1.2 -r1.2
"txn_begin", flags, --- txn/txn.c 17 Dec 2003 21:43:53 -0000 1.1.1.2
DB_DIRTY_READ | DB_TXN_NOWAIT | +++ txn/txn.c 17 Jul 2004 16:07:27 -0000 1.2
- DB_TXN_NOSYNC | DB_TXN_SYNC)) != 0) @@ -127,7 +127,7 @@
+ DB_TXN_NOSYNC | DB_TXN_SYNC | DB_TXN_NOT_DURABLE)) != 0) if ((ret = __db_fchk(dbenv,
return (ret); "txn_begin", flags,
if ((ret = __db_fcchk(dbenv, DB_DIRTY_READ | DB_TXN_NOWAIT |
"txn_begin", flags, DB_TXN_NOSYNC, DB_TXN_SYNC)) != 0) - DB_TXN_NOSYNC | DB_TXN_SYNC)) != 0)
@@ -193,6 +193,8 @@ + DB_TXN_NOSYNC | DB_TXN_SYNC | DB_TXN_NOT_DURABLE)) != 0)
F_SET(txn, TXN_SYNC); return (ret);
if (LF_ISSET(DB_TXN_NOWAIT)) if ((ret = __db_fcchk(dbenv,
F_SET(txn, TXN_NOWAIT); "txn_begin", flags, DB_TXN_NOSYNC, DB_TXN_SYNC)) != 0)
+ if (LF_ISSET(DB_TXN_NOT_DURABLE)) @@ -193,6 +193,8 @@
+ F_SET(txn, TXN_NOLOG); F_SET(txn, TXN_SYNC);
if (LF_ISSET(DB_TXN_NOWAIT))
if ((ret = __txn_begin_int(txn, 0)) != 0) F_SET(txn, TXN_NOWAIT);
goto err; + if (LF_ISSET(DB_TXN_NOT_DURABLE))
@@ -328,7 +330,7 @@ + F_SET(txn, TXN_NOLOG);
* We should set this value when we write the first log record, not
* here. if ((ret = __txn_begin_int(txn, 0)) != 0)
*/ goto err;
- if (DBENV_LOGGING(dbenv)) @@ -328,7 +330,7 @@
+ if (DBENV_LOGGING(dbenv) && !F_ISSET(txn, TXN_NOLOG)) * We should set this value when we write the first log record, not
__log_txn_lsn(dbenv, &begin_lsn, NULL, NULL); * here.
else */
ZERO_LSN(begin_lsn); - if (DBENV_LOGGING(dbenv))
+ if (DBENV_LOGGING(dbenv) && !F_ISSET(txn, TXN_NOLOG))
__log_txn_lsn(dbenv, &begin_lsn, NULL, NULL);
else
ZERO_LSN(begin_lsn);