diff options
| author | unknown <sergefp@mysql.com> | 2005-10-07 11:14:40 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-10-07 11:14:40 +0400 |
| commit | a9363ce9c3d7569ea00384a71829a21ecebadff0 (patch) | |
| tree | 9e291af2c8af2410e2ea4f8b5070141338cda8ed /sql/ha_innodb.cc | |
| parent | 979446f356ce0ad3c388a2cca5dd39bad59a9243 (diff) | |
| parent | 5bdbad3d6c8733d33841468d70d38fc363c1488c (diff) | |
| download | mariadb-git-a9363ce9c3d7569ea00384a71829a21ecebadff0.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug13484
sql/ha_innodb.cc:
Auto merged
mysql-test/r/index_merge_innodb.result:
Auto merged
mysql-test/r/rowid_order_innodb.result:
Auto merged
mysql-test/t/index_merge_innodb.test:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index e8e1ef5169b..cbd23aaab6c 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -7042,7 +7042,7 @@ ha_innobase::cmp_ref( (const char*)ref1, len1, (const char*)ref2, len2); } else { - result = field->cmp((const char*)ref1, + result = field->key_cmp((const char*)ref1, (const char*)ref2); } |