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 /sql/ha_innodb.cc | |
| parent | da2abaf8878313534106c39d361660e21ceda8ba (diff) | |
| parent | d9f998164d6612da1b5a32858de7b9d34929036c (diff) | |
| download | mariadb-git-3c7f6a98357a0867a0a16c4c2a636ec83bdf72fd.tar.gz | |
merge
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 824169467af..f75f431ad52 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -1366,9 +1366,9 @@ innobase_mysql_cmp( case FIELD_TYPE_VAR_STRING: // BAR TODO: Discuss with heikki.tuuri@innodb.com // so that he sends CHARSET_INFO for the field to this function. - ret = my_sortncmp(default_charset_info, - (const char*) a, a_length, - (const char*) b, b_length); + ret = my_strnncoll(default_charset_info, + a, a_length, + b, b_length); if (ret < 0) { return(-1); } else if (ret > 0) { |