diff options
| author | Pavan Deolasee | 2017-06-15 07:41:07 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2017-06-15 07:41:07 +0000 |
| commit | 0ffa504a17f58f2bc045b0039f40e4917ee50d20 (patch) | |
| tree | c629c449bcfcc45de1d03b2586e89932d546e8ba /src/backend/commands/variable.c | |
| parent | 36ccc8d64e61fe9d77bb7ac62267945f7c146baa (diff) | |
| parent | e800656d9a9b40b2f55afabe76354ab6d93353b3 (diff) | |
Merge 'remotes/PGSQL/master' into xl10devel
Merge upstream master branch upto e800656d9a9b40b2f55afabe76354ab6d93353b3.
Code compiles and regression works ok (with lots and lots of failures though).
Diffstat (limited to 'src/backend/commands/variable.c')
| -rw-r--r-- | src/backend/commands/variable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index ed3b2484ae..717bc39c01 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -791,7 +791,7 @@ assign_client_encoding(const char *newval, void *extra) */ ereport(ERROR, (errcode(ERRCODE_INVALID_TRANSACTION_STATE), - errmsg("cannot change client_encoding in a parallel worker"))); + errmsg("cannot change client_encoding during a parallel operation"))); } /* We do not expect an error if PrepareClientEncoding succeeded */ |