summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2004-03-16 06:56:58 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2004-03-16 06:56:58 (GMT)
commit0c65771f9232850364796090c717498b9ff583cf (patch)
tree968b8c5dd5fd53977ff20783908a5b30c9ec47aa /Modules
parent6e4620bfb110707a7dab80f904da196ea697f19b (diff)
downloadcpython-0c65771f9232850364796090c717498b9ff583cf.zip
cpython-0c65771f9232850364796090c717498b9ff583cf.tar.gz
cpython-0c65771f9232850364796090c717498b9ff583cf.tar.bz2
fixes SF bug 914019 - DB.has_key was not honoring its txn argument
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_bsddb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index fcfcbd4..444a009 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -97,7 +97,7 @@
#error "eek! DBVER can't handle minor versions > 9"
#endif
-#define PY_BSDDB_VERSION "4.2.5"
+#define PY_BSDDB_VERSION "4.2.6"
static char *rcs_id = "$Id$";
@@ -2401,7 +2401,7 @@ DB_has_key(DBObject* self, PyObject* args)
data.flags = DB_DBT_USERMEM;
MYDB_BEGIN_ALLOW_THREADS;
- err = self->db->get(self->db, NULL, &key, &data, 0);
+ err = self->db->get(self->db, txn, &key, &data, 0);
MYDB_END_ALLOW_THREADS;
FREE_DBT(key);
return PyInt_FromLong((err == ENOMEM) || (err == 0));