mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor cleanup

Browse source
This commit is contained in:
Sergei Golubchik 2014-03-01 10:19:42 +01:00
parent 45236704e8
commit 8dce8ecfda
3 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
strings/ctype-bin.c
View file

@ -276,18 +276,17 @@ void my_hash_sort_8bit_bin(CHARSET_INFO *cs __attribute__((unused)),
const uchar *key, size_t len,
ulong *nr1, ulong *nr2)
{
const uchar *pos = key;
/*
Remove trailing spaces. We have to do this to be able to compare
'A ' and 'A' as identical
*/
key= skip_trailing_space(key, len);
const uchar *end = skip_trailing_space(key, len);
for (; pos < (uchar*) key ; pos++)
for (; key < end ; key++)
{
nr1[0]^=(ulong) ((((uint) nr1[0] & 63)+nr2[0]) *
((uint)*pos)) + (nr1[0] << 8);
((uint)*key)) + (nr1[0] << 8);
nr2[0]+=3;
}
}
@ -296,14 +295,12 @@ void my_hash_sort_8bit_bin(CHARSET_INFO *cs __attribute__((unused)),
void my_hash_sort_bin(CHARSET_INFO *cs __attribute__((unused)),
const uchar *key, size_t len,ulong *nr1, ulong *nr2)
{
const uchar *pos = key;
const uchar *end = key + len;
key+= len;
for (; pos < (uchar*) key ; pos++)
for (; key < end ; key++)
{
nr1[0]^=(ulong) ((((uint) nr1[0] & 63)+nr2[0]) *
((uint)*pos)) + (nr1[0] << 8);
((uint)*key)) + (nr1[0] << 8);
nr2[0]+=3;
}
}

8
strings/ctype-mb.c
View file

@ -680,18 +680,16 @@ void
my_hash_sort_mb_bin(CHARSET_INFO *cs __attribute__((unused)),
const uchar *key, size_t len,ulong *nr1, ulong *nr2)
{
const uchar *pos = key;
/*
Remove trailing spaces. We have to do this to be able to compare
'A ' and 'A' as identical
*/
key= skip_trailing_space(key, len);
const uchar *end = skip_trailing_space(key, len);
for (; pos < (uchar*) key ; pos++)
for (; key < end ; key++)
{
nr1[0]^=(ulong) ((((uint) nr1[0] & 63)+nr2[0]) *
((uint)*pos)) + (nr1[0] << 8);
((uint)*key)) + (nr1[0] << 8);
nr2[0]+=3;
}
}

12
strings/ctype-ucs2.c
View file

@ -3311,17 +3311,15 @@ static
void my_hash_sort_ucs2_bin(CHARSET_INFO *cs __attribute__((unused)),
const uchar *key, size_t len,ulong *nr1, ulong *nr2)
{
const uchar *pos = key;
key+= len;
const uchar *end = key + len;
while (key > pos+1 && key[-1] == ' ' && key[-2] == '\0')
key-= 2;
while (end > key+1 && end[-1] == ' ' && end[-2] == '\0')
end-= 2;
for (; pos < (uchar*) key ; pos++)
for (; key < (uchar*) end ; key++)
{
nr1[0]^=(ulong) ((((uint) nr1[0] & 63)+nr2[0]) *
((uint)*pos)) + (nr1[0] << 8);
((uint)*key)) + (nr1[0] << 8);
nr2[0]+=3;
}
}