diff options
| author | monty@narttu.mysql.fi <> | 2002-10-14 12:07:16 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2002-10-14 12:07:16 +0300 |
| commit | 3c7f6a98357a0867a0a16c4c2a636ec83bdf72fd (patch) | |
| tree | 26137c7c29554f0b9d1336080b6cdc1044fb6839 /client/sql_string.cc | |
| parent | da2abaf8878313534106c39d361660e21ceda8ba (diff) | |
| parent | d9f998164d6612da1b5a32858de7b9d34929036c (diff) | |
| download | mariadb-git-3c7f6a98357a0867a0a16c4c2a636ec83bdf72fd.tar.gz | |
merge
Diffstat (limited to 'client/sql_string.cc')
| -rw-r--r-- | client/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/sql_string.cc b/client/sql_string.cc index cf9e9f62507..65854ece0ef 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -507,7 +507,7 @@ int sortcmp(const String *x,const String *y) uint32 x_len=x->length(),y_len=y->length(),len=min(x_len,y_len); #ifdef USE_STRCOLL - if (use_strcoll(x->str_charset)) + if (use_strnxfrm(x->str_charset)) { #ifndef CMP_ENDSPACE while (x_len && my_isspace(x->str_charset,s[x_len-1])) |