diff options
author | unknown <sergefp@mysql.com> | 2004-05-29 20:55:46 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2004-05-29 20:55:46 +0400 |
commit | b7130450950898892f14f2a1fef462ecac49e92a (patch) | |
tree | 0107d5b2c95123b7a602a9f396d6aca05ce21a54 /sql/ha_berkeley.cc | |
parent | b0921b1f5a1f610b04641a83d0d7b21e3fe46d84 (diff) | |
parent | 2164db3c8c4c086dcc16d73baf7557a344d82129 (diff) | |
download | mariadb-git-b7130450950898892f14f2a1fef462ecac49e92a.tar.gz |
Manual merge
include/my_base.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/index_merge.result:
Auto merged
mysql-test/r/index_merge_innodb.result:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/opt_range.cc:
Hand merged
sql/opt_range.h:
Hand merged
Diffstat (limited to 'sql/ha_berkeley.cc')
-rw-r--r-- | sql/ha_berkeley.cc | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index df5a45480c6..9f2039d4b69 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -2500,4 +2500,29 @@ ha_rows ha_berkeley::estimate_number_of_rows() return share->rows + HA_BERKELEY_EXTRA_ROWS; } +int ha_berkeley::cmp_ref(const byte *ref1, const byte *ref2) +{ + if (hidden_primary_key) + return memcmp(ref1, ref2, BDB_HIDDEN_PRIMARY_KEY_LENGTH); + + int result; + Field *field; + KEY *key_info=table->key_info+table->primary_key; + KEY_PART_INFO *key_part=key_info->key_part; + KEY_PART_INFO *end=key_part+key_info->key_parts; + + for (; key_part != end; key_part++) + { + field= key_part->field; + result= field->pack_cmp((const char*)ref1, (const char*)ref2, + key_part->length); + if (result) + return result; + ref1 += field->packed_col_length((const char*)ref1, key_part->length); + ref2 += field->packed_col_length((const char*)ref2, key_part->length); + } + + return 0; +} + #endif /* HAVE_BERKELEY_DB */ |