From: Pavan Deolasee <pavan.deolasee@gmail.com>
Date: Sun, 10 Apr 2016 04:46:27 +0000 (+0530)
Subject: Do not add a spurious ';' when not cleaning WAL directory for a datanode
X-Git-Tag: XL_10_R1BETA1~693
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=eed242e84c34d254873b58e000918b3d1c63d3c1;p=postgres-xl.git

Do not add a spurious ';' when not cleaning WAL directory for a datanode
---

diff --git a/contrib/pgxc_ctl/datanode_cmd.c b/contrib/pgxc_ctl/datanode_cmd.c
index 3d639ff79c..a839570332 100644
--- a/contrib/pgxc_ctl/datanode_cmd.c
+++ b/contrib/pgxc_ctl/datanode_cmd.c
@@ -1816,10 +1816,11 @@ cmd_t *prepare_cleanDatanodeMaster(char *nodeName)
 	
 	cmd = initCmd(aval(VAR_datanodeMasterServers)[idx]);
 	snprintf(newCommand(cmd), MAXLINE,
-			 "rm -rf %s; %s %s ; mkdir -p %s; chmod 0700 %s; rm -f /tmp/.s.*%d*",
+			 "rm -rf %s; %s %s %s mkdir -p %s; chmod 0700 %s; rm -f /tmp/.s.*%d*",
 			 aval(VAR_datanodeMasterDirs)[idx],
 			 wal ? "rm -rf " : "",
 			 wal ? aval(VAR_datanodeMasterWALDirs)[idx] : "",
+			 wal ? ";" : "",
 			 aval(VAR_datanodeMasterDirs)[idx],
 			 aval(VAR_datanodeMasterDirs)[idx],
 			 atoi(aval(VAR_datanodePoolerPorts)[idx]));