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.h | |
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.h')
-rw-r--r-- | sql/ha_berkeley.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h index 525c82febd0..f053fd84046 100644 --- a/sql/ha_berkeley.h +++ b/sql/ha_berkeley.h @@ -168,6 +168,7 @@ class ha_berkeley: public handler void print_error(int error, myf errflag); uint8 table_cache_type() { return HA_CACHE_TBL_TRANSACT; } bool primary_key_is_clustered() { return true; } + int cmp_ref(const byte *ref1, const byte *ref2); }; extern bool berkeley_shared_data; |