提交 48076192 编写于 作者: B Bruce Momjian

Renumber bit/boolean aggregates to remove duplicates.

上级 fafd5640
......@@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/catalog/pg_aggregate.h,v 1.43 2004/05/26 15:26:03 momjian Exp $
* $PostgreSQL: pgsql/src/include/catalog/pg_aggregate.h,v 1.44 2004/05/26 18:14:36 momjian Exp $
*
* NOTES
* the genbki.sh script reads this file and generates .bki
......@@ -155,14 +155,14 @@ DATA(insert ( 2518 boolor_statefunc - 16 _null_ ));
DATA(insert ( 2519 booland_statefunc - 16 _null_ ));
/* bitwise integer */
DATA(insert ( 2535 int2and - 21 _null_ ));
DATA(insert ( 2536 int2or - 21 _null_ ));
DATA(insert ( 2537 int4and - 23 _null_ ));
DATA(insert ( 2538 int4or - 23 _null_ ));
DATA(insert ( 2539 int8and - 20 _null_ ));
DATA(insert ( 2540 int8or - 20 _null_ ));
DATA(insert ( 2541 bitand - 1560 _null_ ));
DATA(insert ( 2542 bitor - 1560 _null_ ));
DATA(insert ( 2236 int2and - 21 _null_ ));
DATA(insert ( 2237 int2or - 21 _null_ ));
DATA(insert ( 2238 int4and - 23 _null_ ));
DATA(insert ( 2239 int4or - 23 _null_ ));
DATA(insert ( 2240 int8and - 20 _null_ ));
DATA(insert ( 2241 int8or - 20 _null_ ));
DATA(insert ( 2242 bitand - 1560 _null_ ));
DATA(insert ( 2243 bitor - 1560 _null_ ));
/*
* prototypes for functions in pg_aggregate.c
......
......@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.330 2004/05/26 15:26:04 momjian Exp $
* $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.331 2004/05/26 18:14:36 momjian Exp $
*
* NOTES
* The script catalog/genbki.sh reads this file and generates .bki
......@@ -3552,24 +3552,24 @@ DATA(insert OID = 2519 ( every PGNSP PGUID 12 t f f f i 1 16 "16" _n
DESCR("boolean-and aggregate");
/* bitwise integer aggregates */
DATA(insert OID = 2535 ( bit_and PGNSP PGUID 12 t f f f i 1 21 "21" _null_ aggregate_dummy - _null_));
DATA(insert OID = 2236 ( bit_and PGNSP PGUID 12 t f f f i 1 21 "21" _null_ aggregate_dummy - _null_));
DESCR("bitwise-and smallint aggregate");
DATA(insert OID = 2536 ( bit_or PGNSP PGUID 12 t f f f i 1 21 "21" _null_ aggregate_dummy - _null_));
DATA(insert OID = 2237 ( bit_or PGNSP PGUID 12 t f f f i 1 21 "21" _null_ aggregate_dummy - _null_));
DESCR("bitwise-or smallint aggregate");
DATA(insert OID = 2537 ( bit_and PGNSP PGUID 12 t f f f i 1 23 "23" _null_ aggregate_dummy - _null_));
DATA(insert OID = 2238 ( bit_and PGNSP PGUID 12 t f f f i 1 23 "23" _null_ aggregate_dummy - _null_));
DESCR("bitwise-and integer aggregate");
DATA(insert OID = 2538 ( bit_or PGNSP PGUID 12 t f f f i 1 23 "23" _null_ aggregate_dummy - _null_));
DATA(insert OID = 2239 ( bit_or PGNSP PGUID 12 t f f f i 1 23 "23" _null_ aggregate_dummy - _null_));
DESCR("bitwise-or integer aggregate");
DATA(insert OID = 2539 ( bit_and PGNSP PGUID 12 t f f f i 1 20 "20" _null_ aggregate_dummy - _null_));
DATA(insert OID = 2240 ( bit_and PGNSP PGUID 12 t f f f i 1 20 "20" _null_ aggregate_dummy - _null_));
DESCR("bitwise-and bigint aggregate");
DATA(insert OID = 2540 ( bit_or PGNSP PGUID 12 t f f f i 1 20 "20" _null_ aggregate_dummy - _null_));
DATA(insert OID = 2241 ( bit_or PGNSP PGUID 12 t f f f i 1 20 "20" _null_ aggregate_dummy - _null_));
DESCR("bitwise-or bigint aggregate");
DATA(insert OID = 2541 ( bit_and PGNSP PGUID 12 t f f f i 1 1560 "1560" _null_ aggregate_dummy - _null_));
DATA(insert OID = 2242 ( bit_and PGNSP PGUID 12 t f f f i 1 1560 "1560" _null_ aggregate_dummy - _null_));
DESCR("bitwise-and bit aggregate");
DATA(insert OID = 2542 ( bit_or PGNSP PGUID 12 t f f f i 1 1560 "1560" _null_ aggregate_dummy - _null_));
DATA(insert OID = 2243 ( bit_or PGNSP PGUID 12 t f f f i 1 1560 "1560" _null_ aggregate_dummy - _null_));
DESCR("bitwise-or bit aggregate");
/*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册