diff options
| author | Pavan Deolasee | 2011-04-25 11:52:01 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2011-06-17 08:49:57 +0000 |
| commit | 3cbf503a660e19f5c48c57d3ecd4a746a468cd68 (patch) | |
| tree | 6366e44d3e3ace5833b745357d9aa8977702d79b | |
| parent | 6bbdc5b5befa3ef1f6fbb7a5548b8aa7891873d6 (diff) | |
Merge branch 'PGXC-master' into pgxc-barrier
Conflicts:
src/backend/access/transam/xlog.c
src/backend/parser/gram.y
src/backend/pgxc/pool/execRemote.c
src/backend/tcop/utility.c
| -rw-r--r-- | src/backend/access/transam/xlog.c | 7 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 368cd69c46..2a465e3a38 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -5237,6 +5237,13 @@ readRecoveryCommandFile(void) ereport(DEBUG2, (errmsg("recovery_target_inclusive = %s", tok2))); } +#ifdef PGXC + else if (strcmp(tok1, "recovery_barrier_id") == 0) + { + recoveryTarget = true; + recoveryTargetBarrierId = pstrdup(tok2); + } +#endif else if (strcmp(tok1, "standby_mode") == 0) { if (!parse_bool(tok2, &StandbyMode)) diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 7ec949154c..57a5c2b23c 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -472,7 +472,8 @@ static TypeName *TableFuncTypeName(List *columns); */ /* ordinary key words in alphabetical order */ -/* PGXC - added REPLICATION, DISTRIBUTE, MODULO, BARRIER and HASH */ +/* PGXC - added DISTRIBUTE, DIRECT, HASH, REPLICATION, ROUND ROBIN, + * COORDINATOR, CLEAN, MODULO, NODE, BARRIER */ %token <keyword> ABORT_P ABSOLUTE_P ACCESS ACTION ADD_P ADMIN AFTER AGGREGATE ALL ALSO ALTER ALWAYS ANALYSE ANALYZE AND ANY ARRAY AS ASC ASSERTION ASSIGNMENT ASYMMETRIC AT AUTHORIZATION @@ -11022,7 +11023,8 @@ ColLabel: IDENT { $$ = $1; } /* "Unreserved" keywords --- available for use as any kind of name. */ -/* PGXC - added DISTRIBUTE, HASH, REPLICATION, MODULO, BARRIER */ +/* PGXC - added DISTRIBUTE, DIRECT, HASH, REPLICATION, ROUND ROBIN, + * COORDINATOR, CLEAN, MODULO, NODE, BARRIER */ unreserved_keyword: ABORT_P | ABSOLUTE_P |