diff options
| author | Pavan Deolasee | 2015-06-04 10:22:13 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2015-06-04 10:22:13 +0000 |
| commit | 554adfd94bc69c0aa8c104bab445b7e262f6cb63 (patch) | |
| tree | 4f6a05bcb4b300d014148793e0696301e46f4482 | |
| parent | 326cede48d3fec3a4f590d5f61031065404e2d3f (diff) | |
Fix some post-merge issues
| -rw-r--r-- | src/backend/nodes/readfuncs.c | 6 | ||||
| -rw-r--r-- | src/backend/tcop/postgres.c | 11 | ||||
| -rw-r--r-- | src/gtm/common/mcxt.c | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 2cf71cdbb3..be17c03c36 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -2011,6 +2011,7 @@ _readModifyTable(void) READ_ENUM_FIELD(operation, CmdType); READ_BOOL_FIELD(canSetTag); + READ_UINT_FIELD(nominalRelation); READ_NODE_FIELD(resultRelations); READ_INT_FIELD(resultRelIndex); READ_NODE_FIELD(plans); @@ -2019,6 +2020,11 @@ _readModifyTable(void) READ_NODE_FIELD(fdwPrivLists); READ_NODE_FIELD(rowMarks); READ_INT_FIELD(epqParam); +#ifdef PGXC +#ifndef XCP + READ_NODE_FIELD(remote_plans); +#endif +#endif READ_DONE(); } diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 0f44702dcd..66174c02a4 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -383,6 +383,12 @@ SocketBackend(StringInfo inBuf) { int qtype; + /* + * Get message type code from the frontend. + */ + HOLD_CANCEL_INTERRUPTS(); + pq_startmsgread(); + #ifdef XCP /* * Session from data node may need to do some background work if it is @@ -477,11 +483,6 @@ SocketBackend(StringInfo inBuf) qtype = pq_getbyte(); } #else - /* - * Get message type code from the frontend. - */ - HOLD_CANCEL_INTERRUPTS(); - pq_startmsgread(); qtype = pq_getbyte(); #endif diff --git a/src/gtm/common/mcxt.c b/src/gtm/common/mcxt.c index c8fdd19795..aad4bcd8e6 100644 --- a/src/gtm/common/mcxt.c +++ b/src/gtm/common/mcxt.c @@ -182,7 +182,7 @@ MemoryContextDeleteInternal(MemoryContext context, bool parent_locked) { AssertArg(MemoryContextIsValid(context)); /* We had better not be deleting TopMemoryContext ... */ - Assert(context != TopMemoryContext); + Assert(context != TopMostMemoryContext); /* And not CurrentMemoryContext, either */ Assert(context != CurrentMemoryContext); |