diff options
| author | Pavan Deolasee | 2017-08-18 05:43:32 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2017-08-18 05:43:32 +0000 |
| commit | eea51611515116fd3eff1ab795c9f2fdcf6a08cc (patch) | |
| tree | 4d3e9eab417d94912201967edc679854d3ad9267 /src/include/utils | |
| parent | 0b69492af7186538d831823a6fce3b64616be197 (diff) | |
| parent | 21d304dfedb4f26d0d6587d9ac39b1b5c499bb55 (diff) | |
Merge commit '21d304dfedb4f26d0d6587d9ac39b1b5c499bb55'
This is the merge-base of PostgreSQL's master branch and REL_10_STABLE branch.
This should be the last merge from PG's master branch into XL 10 branch.
Subsequent merges must happen from REL_10_STABLE branch
Diffstat (limited to 'src/include/utils')
| -rw-r--r-- | src/include/utils/catcache.h | 1 | ||||
| -rw-r--r-- | src/include/utils/pg_locale.h | 13 | ||||
| -rw-r--r-- | src/include/utils/ruleutils.h | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index f8ebc903d3..200a3022e7 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -167,7 +167,6 @@ typedef struct catcacheheader extern PGDLLIMPORT MemoryContext CacheMemoryContext; extern void CreateCacheMemoryContext(void); -extern void AtEOXact_CatCache(bool isCommit); extern CatCache *InitCatCache(int id, Oid reloid, Oid indexoid, int nkeys, const int *key, diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index a02d27ba26..f3e04d4d8c 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -21,6 +21,19 @@ #include "utils/guc.h" +#ifdef USE_ICU +/* + * ucol_strcollUTF8() was introduced in ICU 50, but it is buggy before ICU 53. + * (see + * <https://www.postgresql.org/message-id/flat/f1438ec6-22aa-4029-9a3b-26f79d330e72%40manitou-mail.org>) + */ +#if U_ICU_VERSION_MAJOR_NUM >= 53 +#define HAVE_UCOL_STRCOLLUTF8 1 +#else +#undef HAVE_UCOL_STRCOLLUTF8 +#endif +#endif + /* GUC settings */ extern char *locale_messages; diff --git a/src/include/utils/ruleutils.h b/src/include/utils/ruleutils.h index a2206cb7cd..e9c5193855 100644 --- a/src/include/utils/ruleutils.h +++ b/src/include/utils/ruleutils.h @@ -33,5 +33,6 @@ extern List *set_deparse_context_planstate(List *dpcontext, extern List *select_rtable_names_for_explain(List *rtable, Bitmapset *rels_used); extern char *generate_collation_name(Oid collid); +extern char *get_range_partbound_string(List *bound_datums); #endif /* RULEUTILS_H */ |