diff options
| author | unknown <serg@serg.mylan> | 2004-06-11 21:20:53 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-11 21:20:53 +0200 |
| commit | d5880298be964042658b38a54c2ac149327c95b0 (patch) | |
| tree | 6c64f2363a9bbe8a71b9853a4f17c6a46d72e511 /sql/field.cc | |
| parent | e9242d685b25e0dce109719e79271edf1b1581e5 (diff) | |
| download | mariadb-git-d5880298be964042658b38a54c2ac149327c95b0.tar.gz | |
after merge fix
myisam/mi_unique.c:
warning removed
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index df9b4f84ae7..0660e774396 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4242,9 +4242,8 @@ int Field_string::cmp(const char *a_ptr, const char *b_ptr) (const uchar*) b_ptr, field_length); } - return field_charset->coll->strnncoll(field_charset, - (const uchar*) a_ptr, field_length, - (const uchar*) b_ptr, field_length); + return my_strnncoll(field_charset,(const uchar*) a_ptr, field_length, + (const uchar*) b_ptr, field_length); } void Field_string::sort_string(char *to,uint length) |