This commit eliminates compilation warning in GTM related to the modified files.

	modified:   src/backend/utils/mmgr/mcxt.c
	modified:   src/gtm/client/gtm_client.c
	modified:   src/gtm/common/gtm_serialize.c
	modified:   src/gtm/common/mcxt.c
	modified:   src/gtm/main/gtm_standby.c
	modified:   src/include/gtm/gtm_standby.h

6 files changed, 9 insertions, 21 deletions

diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 92473a3b43..01e70155b3 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -50,6 +50,9 @@ MemoryContext CurTransactionContext = NULL;
 MemoryContext PortalContext = NULL;
 
 static void MemoryContextStatsInternal(MemoryContext context, int level);
+#ifdef PGXC
+void *allocTopCxt(size_t s);
+#endif
 
 
 /*****************************************************************************
diff --git a/src/gtm/client/gtm_client.c b/src/gtm/client/gtm_client.c
index 67af8d7eef..2cc5b4dd9c 100644
--- a/src/gtm/client/gtm_client.c
+++ b/src/gtm/client/gtm_client.c
@@ -1608,7 +1608,6 @@ set_begin_end_backup(GTM_Conn *conn, bool begin)
 {
 	GTM_Result *res = NULL;
 	time_t finish_time;
-	int ii;
 
 	if (gtmpqPutMsgStart('C', true, conn))
 		goto send_failed;
diff --git a/src/gtm/common/gtm_serialize.c b/src/gtm/common/gtm_serialize.c
index adef9e4463..b2a9b953ba 100644
--- a/src/gtm/common/gtm_serialize.c
+++ b/src/gtm/common/gtm_serialize.c
@@ -352,7 +352,6 @@ gtm_deserialize_transactioninfo(GTM_TransactionInfo *data, const char *buf, size
 {
 	int len = 0;
 	int i;
-	int namelen;
 	uint32 string_len;
 
 	memset(data, 0, sizeof(GTM_TransactionInfo));
@@ -378,7 +377,6 @@ gtm_deserialize_transactioninfo(GTM_TransactionInfo *data, const char *buf, size
 	len += sizeof(GTM_TransactionStates);
 
 	/* GTM_TransactionInfo.gti_coordname */
-#if 1
 	{
 		uint32 ll;
 
@@ -393,22 +391,6 @@ gtm_deserialize_transactioninfo(GTM_TransactionInfo *data, const char *buf, size
 		else
 			data->gti_coordname = NULL;
 	}
-#else
-	if (data->gti_coordname != NULL)
-	{
-		namelen = (uint32)strlen(data->gti_coordname);
-		memcpy((char *)buf + len, &namelen, sizeof(uint32));
-		len += sizeof(uint32);
-		memcpy((char *)buf + len, data->gti_coordname, namelen);
-		len += namelen;
-	}
-	else
-	{
-		namelen = 0;
-		memcpy((char *)buf + len, &namelen, sizeof(uint32));
-		len += sizeof(uint32);
-	}
-#endif
 
 	/* GTM_TransactionInfo.gti_xmin */
 	memcpy(&(data->gti_xmin), buf + len, sizeof(GlobalTransactionId));
diff --git a/src/gtm/common/mcxt.c b/src/gtm/common/mcxt.c
index db7b3b1429..c9294a2296 100644
--- a/src/gtm/common/mcxt.c
+++ b/src/gtm/common/mcxt.c
@@ -39,6 +39,7 @@
 
 static void MemoryContextStatsInternal(MemoryContext context, int level);
 static void MemoryContextDeleteInternal(MemoryContext context, bool parent_locked);
+void *allocTopMemCxt(size_t s);
 
 MemoryContext	TopMostMemoryContext;
 
diff --git a/src/gtm/main/gtm_standby.c b/src/gtm/main/gtm_standby.c
index 87fad79854..f065d2ec19 100644
--- a/src/gtm/main/gtm_standby.c
+++ b/src/gtm/main/gtm_standby.c
@@ -503,7 +503,6 @@ gtm_standby_end_backup(void)
 
 extern char *NodeName;		/* Defined in main.c */
 
-/* ---WIP, Dec.1st, 2011, K.Suzuki --- */
 void
 gtm_standby_finishActiveConn(void)
 {
@@ -511,7 +510,7 @@ gtm_standby_finishActiveConn(void)
 	if (GTM_ActiveConn == NULL)
 	{
 		elog(DEBUG3, "Error in connection");
-		return 0;
+		return;
 	}
 	elog(LOG, "Connection established to the GTM active.");
 
diff --git a/src/include/gtm/gtm_standby.h b/src/include/gtm/gtm_standby.h
index a33a8b2316..c51115eb7d 100644
--- a/src/include/gtm/gtm_standby.h
+++ b/src/include/gtm/gtm_standby.h
@@ -49,6 +49,10 @@ int gtm_standby_begin_backup(void);
 int gtm_standby_end_backup(void);
 void gtm_standby_closeActiveConn(void);
 
+void gtm_standby_finishActiveConn(void);
+
+
+
 
 /*
  * Startup mode