Skip to content

Commit ec7129b

Browse files
committed
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.
1 parent 4955109 commit ec7129b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/include/catalog/catversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/* yyyymmddN */
56-
#define CATALOG_VERSION_NO 201706081
56+
#define CATALOG_VERSION_NO 201706131
5757

5858
#endif

src/include/catalog/pg_collation.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ typedef FormData_pg_collation *Form_pg_collation;
7070
* ----------------
7171
*/
7272

73-
DATA(insert OID = 100 ( default PGNSP PGUID d -1 "" "" 0 ));
73+
DATA(insert OID = 100 ( default PGNSP PGUID d -1 "" "" _null_ ));
7474
DESCR("database's default collation");
7575
#define DEFAULT_COLLATION_OID 100
76-
DATA(insert OID = 950 ( C PGNSP PGUID c -1 "C" "C" 0 ));
76+
DATA(insert OID = 950 ( C PGNSP PGUID c -1 "C" "C" _null_ ));
7777
DESCR("standard C collation");
7878
#define C_COLLATION_OID 950
79-
DATA(insert OID = 951 ( POSIX PGNSP PGUID c -1 "POSIX" "POSIX" 0 ));
79+
DATA(insert OID = 951 ( POSIX PGNSP PGUID c -1 "POSIX" "POSIX" _null_ ));
8080
DESCR("standard POSIX collation");
8181
#define POSIX_COLLATION_OID 951
8282

0 commit comments

Comments
 (0)