diff options
| author | unknown <monty@narttu.mysql.fi> | 2002-10-14 12:07:16 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2002-10-14 12:07:16 +0300 |
| commit | 6fc7e94616ef775731423db63af7fc506fdddcae (patch) | |
| tree | 26137c7c29554f0b9d1336080b6cdc1044fb6839 /sql/ha_innodb.cc | |
| parent | 40c2e7499b40a10ee2b8042e5d672b7c4d4c66fe (diff) | |
| parent | a299a27021a7bdd65f93f99f9eb0003f082b305d (diff) | |
| download | mariadb-git-6fc7e94616ef775731423db63af7fc506fdddcae.tar.gz | |
merge
client/mysql.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_union.cc:
Auto merged
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) { |