diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-30 11:15:14 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-30 11:15:14 +0400 |
| commit | 7ae7275c9c086c4d2eb61f17bce0a8a6ea4c5ef9 (patch) | |
| tree | 4bf943936ae0609c73eb4b1d0aa5a8bf1ce6d00a /client | |
| parent | a2ccd6f0fe5bd7cc863ad60df95a16a178d677aa (diff) | |
| download | mariadb-git-7ae7275c9c086c4d2eb61f17bce0a8a6ea4c5ef9.tar.gz | |
Always use USE_STRCOLL code
Diffstat (limited to 'client')
| -rw-r--r-- | client/sql_string.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/client/sql_string.cc b/client/sql_string.cc index 652ea1737e4..8ab205d9fb1 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -576,7 +576,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 @@ -590,7 +589,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) @@ -633,9 +631,7 @@ int sortcmp(const String *x,const String *y) #else return (int) (x_len-y_len); #endif /* CMP_ENDSPACE */ -#ifdef USE_STRCOLL } -#endif } |