diff options
| author | Pavan Deolasee | 2017-08-18 05:43:32 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2017-08-18 05:43:32 +0000 |
| commit | eea51611515116fd3eff1ab795c9f2fdcf6a08cc (patch) | |
| tree | 4d3e9eab417d94912201967edc679854d3ad9267 /src/backend/commands/variable.c | |
| parent | 0b69492af7186538d831823a6fce3b64616be197 (diff) | |
| parent | 21d304dfedb4f26d0d6587d9ac39b1b5c499bb55 (diff) | |
Merge commit '21d304dfedb4f26d0d6587d9ac39b1b5c499bb55'
This is the merge-base of PostgreSQL's master branch and REL_10_STABLE branch.
This should be the last merge from PG's master branch into XL 10 branch.
Subsequent merges must happen from REL_10_STABLE branch
Diffstat (limited to 'src/backend/commands/variable.c')
| -rw-r--r-- | src/backend/commands/variable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index fe1988b4a1..db1717a6d7 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -476,8 +476,8 @@ show_log_timezone(void) * We allow idempotent changes (r/w -> r/w and r/o -> r/o) at any time, and * we also always allow changes from read-write to read-only. However, * read-only may be changed to read-write only when in a top-level transaction - * that has not yet taken an initial snapshot. Can't do it in a hot standby - * slave, either. + * that has not yet taken an initial snapshot. Can't do it in a hot standby, + * either. * * If we are not in a transaction at all, just allow the change; it means * nothing since XactReadOnly will be reset by the next StartTransaction(). |