diff options
| author | Andrew Dunstan | 2007-09-24 01:29:30 +0000 |
|---|---|---|
| committer | Andrew Dunstan | 2007-09-24 01:29:30 +0000 |
| commit | 02138357ffc8c41a3d646035368712a5394f1f5f (patch) | |
| tree | 81b2f9713ea0ee3caecc045e94cce66aed37767f /src/include | |
| parent | c3b193a5c3d7395a4166d262b9a4f4c625644dfd (diff) | |
Remove "convert 'blah' using conversion_name" facility, because if it
produces text it is an encoding hole and if not it's incompatible
with the spec, whatever the spec means (which we're not sure about anyway).
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/pg_proc.h | 5 | ||||
| -rw-r--r-- | src/include/utils/builtins.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 3eaead16bda..6dba4dbc39d 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.471 2007/09/20 17:56:32 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.472 2007/09/24 01:29:29 adunstan Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -2244,9 +2244,6 @@ DESCR("convert string with specified destination encoding name"); DATA(insert OID = 1813 ( convert PGNSP PGUID 12 1 0 f f t f s 3 17 "17 19 19" _null_ _null_ _null_ pg_convert - _null_ _null_ )); DESCR("convert string with specified encoding names"); -DATA(insert OID = 1619 ( convert_using PGNSP PGUID 12 1 0 f f t f s 2 17 "25 25" _null_ _null_ _null_ pg_convert_using - _null_ _null_ )); -DESCR("convert string with specified conversion name"); - DATA(insert OID = 1264 ( pg_char_to_encoding PGNSP PGUID 12 1 0 f f t f s 1 23 "19" _null_ _null_ _null_ PG_char_to_encoding - _null_ _null_ )); DESCR("convert encoding name to encoding id"); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index c1610f320f5..d1b11a5e625 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.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/utils/builtins.h,v 1.303 2007/09/18 17:41:17 adunstan Exp $ + * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.304 2007/09/24 01:29:30 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -941,9 +941,6 @@ extern Datum pg_advisory_unlock_all(PG_FUNCTION_ARGS); /* access/transam/twophase.c */ extern Datum pg_prepared_xact(PG_FUNCTION_ARGS); -/* catalog/pg_conversion.c */ -extern Datum pg_convert_using(PG_FUNCTION_ARGS); - /* commands/prepare.c */ extern Datum pg_prepared_statement(PG_FUNCTION_ARGS); |