summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2012-06-20 14:01:27 +1000
committerMichael Cahill <michael.cahill@wiredtiger.com>2012-06-20 15:32:48 +1000
commit8896c8d450ff08052d22928dee7c6faad535cf48 (patch)
tree30ddb9e94390a4fe69c762d1a71eadf8d9b6abc4 /dist
parent3c4adbdbb247106841132bf903eccf8fef43f563 (diff)
downloadmongo-8896c8d450ff08052d22928dee7c6faad535cf48.tar.gz
Fix a case where checkpoints could self-deadlock trying to reenter the connection spinlock.
Diffstat (limited to 'dist')
-rw-r--r--dist/api_data.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/dist/api_data.py b/dist/api_data.py
index 30195b7c890..12c790dec5c 100644
--- a/dist/api_data.py
+++ b/dist/api_data.py
@@ -425,6 +425,14 @@ flags = {
###################################################
# Structure flag declarations
###################################################
- 'conn' : [ 'CONN_NOSYNC', 'CONN_TRANSACTIONAL', 'SERVER_RUN' ],
- 'session' : [ 'SESSION_INTERNAL', 'SESSION_SALVAGE_QUIET_ERR' ],
+ 'conn' : [
+ 'CONN_NOSYNC',
+ 'CONN_TRANSACTIONAL',
+ 'SERVER_RUN'
+ ],
+ 'session' : [
+ 'SESSION_HAS_CONNLOCK',
+ 'SESSION_INTERNAL',
+ 'SESSION_SALVAGE_QUIET_ERR'
+ ],
}