Merge conflict in 7c0eb3c622eb0882f460805109f244679b340964 Tighten up parsing logic in gen_node_support.pl.

[Sairakan]

Merge conflict in src/include/nodes/parsenodes.h

/*
 * A_Const - a literal constant
 *
 * Value nodes are inline for performance.  You can treat 'val' as a node,
 * as in IsA(&val, Integer).  'val' is not valid if isnull is true.
 */
union ValUnion
{
	Node		node;
	Integer		ival;
	Float		fval;
	Boolean		boolval;
	String		sval;
	BitString	bsval;
};

typedef struct A_Const
{
	pg_node_attr(custom_copy_equal, custom_read_write, no_read)

	NodeTag		type;
<<<<<<< ours

	/*
	 * Value nodes are inline for performance.  You can treat 'val' as a node,
	 * as in IsA(&val, Integer).  'val' is not valid if isnull is true.
	 */
	union ValUnion
	{
		Node		node;
		Integer		ival;
		Float		fval;
		Boolean		boolval;
		String		sval;
		BitString	bsval;
		TSQL_HexString hsval; -- Babelfish added
	}			val;
=======
	union ValUnion val;
>>>>>>> theirs
	bool		isnull;			/* SQL NULL constant */
	int			location;		/* token location, or -1 if unknown */
} A_Const;

This conflict moved the union declaration in A_Const to outside of the struct definition, so just make sure that TSQL_HexString hsval also gets put in the new union declaration before taking in the new changes.