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
This commit is contained in:
unknown 2005-10-07 11:14:40 +04:00
commit a9363ce9c3
4 changed files with 103 additions and 2 deletions

View file

@ -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);
}