mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Always use USE_STRCOLL code
This commit is contained in:
@ -577,7 +577,6 @@ int sortcmp(const String *x,const String *y)
|
||||
const char *t= y->ptr();
|
||||
uint32 x_len=x->length(),y_len=y->length(),len=min(x_len,y_len);
|
||||
|
||||
#ifdef USE_STRCOLL
|
||||
if (use_strnxfrm(x->str_charset))
|
||||
{
|
||||
#ifndef CMP_ENDSPACE
|
||||
@ -591,7 +590,6 @@ int sortcmp(const String *x,const String *y)
|
||||
}
|
||||
else
|
||||
{
|
||||
#endif /* USE_STRCOLL */
|
||||
x_len-=len; // For easy end space test
|
||||
y_len-=len;
|
||||
if (x->str_charset->sort_order)
|
||||
@ -634,9 +632,7 @@ int sortcmp(const String *x,const String *y)
|
||||
#else
|
||||
return (int) (x_len-y_len);
|
||||
#endif /* CMP_ENDSPACE */
|
||||
#ifdef USE_STRCOLL
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user