mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge polly.local:/home/kaa/src/maint/bug27643/my50-bug27643

Browse source 
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
This commit is contained in:
unknown 2007-05-31 14:58:22 +04:00
commit d92bc733f8
8 changed files with 100 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
strings/ctype-ucs2.c
View file

@ -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]) *