From b4c8d49036b971d892b2dfe1c71d3f0cee116e7f Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Sat, 20 Jan 2007 09:27:20 +0000
Subject: Fix xmlconcat by properly merging the XML declarations.  Add
 aggregate function xmlagg.

---
 src/include/catalog/catversion.h   | 4 ++--
 src/include/catalog/pg_aggregate.h | 5 ++++-
 src/include/catalog/pg_proc.h      | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/include/catalog')

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index c8892d24f2..896f1513fb 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.372 2007/01/16 21:41:13 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.373 2007/01/20 09:27:19 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200701161
+#define CATALOG_VERSION_NO	200701201
 
 #endif
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index fcad73fdd3..1f2ba57147 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_aggregate.h,v 1.59 2007/01/05 22:19:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_aggregate.h,v 1.60 2007/01/20 09:27:19 petere Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -221,6 +221,9 @@ DATA(insert ( 2241 int8or		  -					0	20		_null_ ));
 DATA(insert ( 2242 bitand		  -					0	1560	_null_ ));
 DATA(insert ( 2243 bitor		  -					0	1560	_null_ ));
 
+/* xml */
+DATA(insert ( 2901 xmlconcat2	  -					0	142		_null_ ));
+
 /*
  * prototypes for functions in pg_aggregate.c
  */
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 24a287e3d6..f22a0d15b8 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.437 2007/01/16 21:41:13 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.438 2007/01/20 09:27:19 petere Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -4037,6 +4037,10 @@ DATA(insert OID = 2898 (  xml_recv		   PGNSP PGUID 12 f f t f s 1 142 "2281" _nu
 DESCR("I/O");
 DATA(insert OID = 2899 (  xml_send		   PGNSP PGUID 12 f f t f s 1 17 "142" _null_ _null_ _null_	xml_send - _null_ ));
 DESCR("I/O");
+DATA(insert OID = 2900 (  xmlconcat2       PGNSP PGUID 12 f f f f i 2 142 "142 142" _null_ _null_ _null_ xmlconcat2 - _null_ ));
+DESCR("aggregate transition function");
+DATA(insert OID = 2901 (  xmlagg           PGNSP PGUID 12 t f f f i 1 142 "142" _null_ _null_ _null_ aggregate_dummy - _null_ ));
+DESCR("concatenate XML values");
 
 
 /*
-- 
cgit v1.2.1