diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-06-13 08:55:09 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-06-13 08:55:09 -0400 |
| commit | ec7129b7812ce276520f749d0946875663c34093 (patch) | |
| tree | a69611226458b490fcbfb804fd2530c1158ebcdf /src | |
| parent | 4955109d2281eacec6af8aee203382ac3991f1cf (diff) | |
| download | postgresql-ec7129b7812ce276520f749d0946875663c34093.tar.gz postgresql-ec7129b7812ce276520f749d0946875663c34093.zip | |
Fix collprovider of predefined collations
An earlier version of the patch had collprovider as an integer and thus
set these to 0, but the correct setting is now null.
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
| -rw-r--r-- | src/include/catalog/pg_collation.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index c6572410824..ae34f75a849 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 201706081 +#define CATALOG_VERSION_NO 201706131 #endif diff --git a/src/include/catalog/pg_collation.h b/src/include/catalog/pg_collation.h index 1e44ce0949c..901c0b5115e 100644 --- a/src/include/catalog/pg_collation.h +++ b/src/include/catalog/pg_collation.h @@ -70,13 +70,13 @@ typedef FormData_pg_collation *Form_pg_collation; * ---------------- */ -DATA(insert OID = 100 ( default PGNSP PGUID d -1 "" "" 0 )); +DATA(insert OID = 100 ( default PGNSP PGUID d -1 "" "" _null_ )); DESCR("database's default collation"); #define DEFAULT_COLLATION_OID 100 -DATA(insert OID = 950 ( C PGNSP PGUID c -1 "C" "C" 0 )); +DATA(insert OID = 950 ( C PGNSP PGUID c -1 "C" "C" _null_ )); DESCR("standard C collation"); #define C_COLLATION_OID 950 -DATA(insert OID = 951 ( POSIX PGNSP PGUID c -1 "POSIX" "POSIX" 0 )); +DATA(insert OID = 951 ( POSIX PGNSP PGUID c -1 "POSIX" "POSIX" _null_ )); DESCR("standard POSIX collation"); #define POSIX_COLLATION_OID 951 |