diff options
| author | Kevin Grittner | 2011-07-28 17:37:16 +0000 |
|---|---|---|
| committer | Kevin Grittner | 2011-07-28 17:37:16 +0000 |
| commit | fddf9d17526514ad506bf779fb28353e3d442a25 (patch) | |
| tree | 69f3dd49445438ec83df617189971ee9605e4392 | |
| parent | 18f9ad4c639974c83fc61d78964f0c7cc19acb72 (diff) | |
| parent | 0fe8150827693fca429a01b1cf2914f7f14d3b2d (diff) | |
Merge branch 'master' into replrepl
| -rw-r--r-- | src/backend/storage/lmgr/predicate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index e7340963bb..c324bceef5 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -663,7 +663,7 @@ SetRWConflict(SERIALIZABLEXACT *reader, SERIALIZABLEXACT *writer) if (!conflict) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("not enough elements in RWConflictPool to record a rw-conflict"), + errmsg("not enough elements in RWConflictPool to record a read/write conflict"), errhint("You might need to run fewer transactions at a time or increase max_connections."))); SHMQueueDelete(&conflict->outLink); @@ -691,7 +691,7 @@ SetPossibleUnsafeConflict(SERIALIZABLEXACT *roXact, if (!conflict) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), - errmsg("not enough elements in RWConflictPool to record a potential rw-conflict"), + errmsg("not enough elements in RWConflictPool to record a potential read/write conflict"), errhint("You might need to run fewer transactions at a time or increase max_connections."))); SHMQueueDelete(&conflict->outLink); |