Fix compiler warnings after merge

Author: knizhnik

src/backend/postmaster/postmaster.c

@@ -2091,8 +2091,6 @@ ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
 {
 	int32		len;
 	char	   *buf;
-	ProtocolVersion proto;
-	MemoryContext oldcontext;
 
 	pq_startmsgread();
 
@@ -2294,7 +2292,7 @@ ParseStartupPacket(Port *port, MemoryContext memctx, void* buf, int len, bool ss
 
 		while (offset < len)
 		{
-			char	   *nameptr = buf + offset;
+			char	   *nameptr = (char*)buf + offset;
 			int32		valoffset;
 			char	   *valptr;
 
@@ -2303,7 +2301,7 @@ ParseStartupPacket(Port *port, MemoryContext memctx, void* buf, int len, bool ss
 			valoffset = offset + strlen(nameptr) + 1;
 			if (valoffset >= len)
 				break;			/* missing value, will complain below */
-			valptr = buf + valoffset;
+			valptr = (char*)buf + valoffset;
 
 			if (strcmp(nameptr, "database") == 0)
 				port->database_name = pstrdup(valptr);

src/backend/utils/adt/lockfuncs.c

@@ -676,12 +676,14 @@ pg_isolation_test_session_is_blocked(PG_FUNCTION_ARGS)
  *	field4: 1 if using an int8 key, 2 if using 2 int4 keys
  */
 #define SET_LOCKTAG_INT64(tag, key64) \
+	MyProc->is_tainted = true; \
 	SET_LOCKTAG_ADVISORY(tag, \
 						 MyDatabaseId, \
 						 (uint32) ((key64) >> 32), \
 						 (uint32) (key64), \
 						 1)
 #define SET_LOCKTAG_INT32(tag, key1, key2) \
+	MyProc->is_tainted = true; \
 	SET_LOCKTAG_ADVISORY(tag, MyDatabaseId, key1, key2, 2)
 
 /*

src/backend/utils/misc/guc.c

@@ -492,6 +492,7 @@ static const struct config_enum_entry session_schedule_options[] = {
 	{"round-robin", SESSION_SCHED_ROUND_ROBIN, false},
 	{"random", SESSION_SCHED_RANDOM, false},
 	{"load-balancing", SESSION_SCHED_LOAD_BALANCING, false},
+	{NULL, 0, false}
 };
 
 static struct config_enum_entry recovery_init_sync_method_options[] = {

src/include/catalog/pg_proc.dat

@@ -8170,7 +8170,7 @@
   proname => 'gist_poly_distance', prorettype => 'float8',
   proargtypes => 'internal polygon int2 oid internal',
   prosrc => 'gist_poly_distance' },
-{ oid => '3435', descr => 'sort support',
+{ oid => '6105', descr => 'sort support',
   proname => 'gist_point_sortsupport', prorettype => 'void',
   proargtypes => 'internal', prosrc => 'gist_point_sortsupport' },