From 2a406e56dea3e750e74cc38115e83e30217b4822 Mon Sep 17 00:00:00 2001
From: Michael P
Date: Thu, 8 Dec 2011 13:50:25 +0900
Subject: Simplify node DDL grammar and supress slave management part

New grammar uses WITH clause of CREATE TABLE in this manner:
CREATE/ALTER NODE nodename WITH (
[ TYPE = ('coordinator' | 'datanode'),]
[ HOST = 'string',]
[ PORT = portnum,]
[ PRIMARY,]
[ PREFERRED ]);
This applies to CREATE/ALTER NODE.
Grammar simplification results in the deletion in related_to column
of pgxc_node catalog.

Documentation is updated in consequence.

This commit solves also an issue with variable names sharing same
format between GTM and XC nodes.
---
 src/bin/initdb/initdb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/bin')

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 2b8f691b37..dd6a2bb325 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1496,7 +1496,7 @@ setup_nodeself(void)
 
 	PG_CMD_OPEN;
 
-	PG_CMD_PRINTF1("CREATE NODE %s WITH (COORDINATOR MASTER);\n",
+	PG_CMD_PRINTF1("CREATE NODE %s WITH (type = 'coordinator');\n",
 				   nodename);
 
 	PG_CMD_CLOSE;
-- 
cgit v1.2.3