Repository: incubator-hawq
Updated Branches:
  refs/heads/master eab1908b4 -> 0d2599462


HAWQ-1117.RM crash when init db after configure with param '--enable-cassert'


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/0d259946
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/0d259946
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/0d259946

Branch: refs/heads/master
Commit: 0d2599462da8df97d1c91e3c3438adde2b8b66dc
Parents: eab1908
Author: stanlyxiang <[email protected]>
Authored: Wed Nov 2 16:14:40 2016 +0800
Committer: ivan <[email protected]>
Committed: Thu Nov 3 10:17:02 2016 +0800

----------------------------------------------------------------------
 src/backend/postmaster/postmaster.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0d259946/src/backend/postmaster/postmaster.c
----------------------------------------------------------------------
diff --git a/src/backend/postmaster/postmaster.c 
b/src/backend/postmaster/postmaster.c
index cefcb86..023d382 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -5850,6 +5850,8 @@ BackendRun(Port *port)
        if (port->cmdline_options)
                maxac += (strlen(port->cmdline_options) + 1) / 2;
 
+       MemoryContextSwitchTo(TopMemoryContext);
+
        av = (char **) MemoryContextAlloc(TopMemoryContext,
                                                                          maxac 
* sizeof(char *));
        ac = 0;
@@ -5890,7 +5892,6 @@ BackendRun(Port *port)
         * data here.  Also, subsidiary data such as the username isn't lost
         * either; see ProcessStartupPacket().
         */
-       MemoryContextSwitchTo(TopMemoryContext);
        MemoryContextDelete(PostmasterContext);
        PostmasterContext = NULL;
 

Reply via email to