diff options
| author | unknown <kaa@polly.local> | 2007-05-31 14:58:22 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-05-31 14:58:22 +0400 |
| commit | 783b04119a52cf1c704c07f128e69cf3820711c4 (patch) | |
| tree | cbaa5936229d6f86c780c22524967302461b6162 /strings/ctype-ucs2.c | |
| parent | 9bc43f2499354e75affd493589f66cd52cdb663f (diff) | |
| parent | b6829f417363db40c3aba03ce832db27899eba61 (diff) | |
| download | mariadb-git-783b04119a52cf1c704c07f128e69cf3820711c4.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643
into polly.local:/home/kaa/src/maint/bug27643/my51-bug27643
mysql-test/r/ctype_ucs2_def.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
mysql-test/t/ctype_ucs2_def.test:
Auto merged
mysql-test/t/heap_hash.test:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
Diffstat (limited to 'strings/ctype-ucs2.c')
| -rw-r--r-- | strings/ctype-ucs2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index d3b65aa1643..d337c519f84 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1486,7 +1486,10 @@ void my_hash_sort_ucs2_bin(CHARSET_INFO *cs __attribute__((unused)), const uchar *pos = key; key+= len; - + + while (key > pos+1 && key[-1] == ' ' && key[-2] == '\0') + key-= 2; + for (; pos < (uchar*) key ; pos++) { nr1[0]^=(ulong) ((((uint) nr1[0] & 63)+nr2[0]) * |