aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/tsearch/ts_locale.c2
-rw-r--r--src/backend/tsearch/wparser_def.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/tsearch/ts_locale.c b/src/backend/tsearch/ts_locale.c
index e42c4734c74..c66f4aa8bfa 100644
--- a/src/backend/tsearch/ts_locale.c
+++ b/src/backend/tsearch/ts_locale.c
@@ -243,7 +243,9 @@ char *
lowerstr_with_len(const char *str, int len)
{
char *out;
+#ifdef USE_WIDE_UPPER_LOWER
Oid collation = DEFAULT_COLLATION_OID; /*TODO*/
+#endif
if (len == 0)
return pstrdup("");
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
index 65d0632f9a1..3981a50589d 100644
--- a/src/backend/tsearch/wparser_def.c
+++ b/src/backend/tsearch/wparser_def.c
@@ -287,7 +287,6 @@ static TParser *
TParserInit(char *str, int len)
{
TParser *prs = (TParser *) palloc0(sizeof(TParser));
- Oid collation = DEFAULT_COLLATION_OID; /*TODO*/
prs->charmaxlen = pg_database_encoding_max_length();
prs->str = str;
@@ -300,6 +299,8 @@ TParserInit(char *str, int len)
*/
if (prs->charmaxlen > 1)
{
+ Oid collation = DEFAULT_COLLATION_OID; /*TODO*/
+
prs->usewide = true;
if ( lc_ctype_is_c(collation) )
{