ldap/servers/slapd/back-ldbm/dblayer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e535ff5a45601c4279a14e92eaf1d68729866d38
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Fri Jun 28 11:37:05 2013 -0600
Ticket #47409 - allow setting db deadlock rejection policy
https://fedorahosted.org/389/ticket/47409
Reviewed by: nhosoi (Thanks!)
Branch: master
Fix Description: Forgot to add flags parameter to last commit.
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: yes - document new config parameter
(cherry picked from commit 67cbb2eac1300ae57acf75f4c3299103046a3323)
(cherry picked from commit ceaa9ac5267c04c23e3fb8e366e17295ffd6b93c)
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c
b/ldap/servers/slapd/back-ldbm/dblayer.c
index 1b89e7e..5bbc34d 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -4289,7 +4289,7 @@ static int deadlock_threadmain(void *param)
if (dblayer_db_uses_locking(db_env) && (deadlock_policy >
DB_LOCK_NORUN)) {
int rejected = 0;
- if ((rval = LOCK_DETECT(db_env, 0, deadlock_policy, &rejected)) != 0)
{
+ if ((rval = LOCK_DETECT(db_env, flags, deadlock_policy, &rejected))
!= 0) {
LDAPDebug(LDAP_DEBUG_ANY,
"Serious Error---Failed in deadlock detect (aborted at
0x%x), err=%d (%s)\n",
rejected, rval, dblayer_strerror(rval));