diff options
Diffstat (limited to 'src/backend/utils/adt/varlena.c')
| -rw-r--r-- | src/backend/utils/adt/varlena.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index d96890f425e..f88c9b21fa0 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.153.2.1 2007/07/19 20:34:27 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.153.2.2 2008/03/13 18:32:09 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1002,6 +1002,19 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2) ereport(ERROR, (errmsg("could not compare Unicode strings: %m"))); + /* + * In some locales wcscoll() can claim that nonidentical strings + * are equal. Believing that would be bad news for a number of + * reasons, so we follow Perl's lead and sort "equal" strings + * according to strcmp (on the UTF-8 representation). + */ + if (result == 0) + { + result = strncmp(arg1, arg2, Min(len1, len2)); + if ((result == 0) && (len1 != len2)) + result = (len1 < len2) ? -1 : 1; + } + if (a1p != a1buf) pfree(a1p); if (a2p != a2buf) |