summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut2012-04-22 16:23:47 +0000
committerPeter Eisentraut2012-04-22 16:23:47 +0000
commit48658a1b818060fcfb3c91704943c5fbcf10088e (patch)
treecd72639f8c625d4b80d5d24124613be6bdaeffa1 /src
parent33e99153e93b9accfa51ac036828144e1c2507b7 (diff)
Fix some typos
Josh Kupershmidt
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/transam/README2
-rw-r--r--src/backend/postmaster/postmaster.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/access/transam/README b/src/backend/access/transam/README
index de72f71ebca..54d97a56e80 100644
--- a/src/backend/access/transam/README
+++ b/src/backend/access/transam/README
@@ -197,7 +197,7 @@ If a subtransaction requires an XID, we always first assign one to its
parent. This maintains the invariant that child transactions have XIDs later
than their parents, which is assumed in a number of places.
-The subsidiary actions of obtaining a lock on the XID and and entering it into
+The subsidiary actions of obtaining a lock on the XID and entering it into
pg_subtrans and PG_PROC are done at the time it is assigned.
A transaction that has no XID still needs to be identified for various
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index a481eef2c28..d59ee68df54 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -2506,7 +2506,7 @@ reaper(SIGNAL_ARGS)
* Was it the archiver? If so, just try to start a new one; no need
* to force reset of the rest of the system. (If fail, we'll try
* again in future cycles of the main loop.). Unless we were waiting
- * for it to shut down; don't restart it in that case, and and
+ * for it to shut down; don't restart it in that case, and
* PostmasterStateMachine() will advance to the next shutdown step.
*/
if (pid == PgArchPID)