diff options
| author | unknown <ingo@mysql.com> | 2004-06-25 12:59:47 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2004-06-25 12:59:47 +0200 |
| commit | fb987c8907c55d974b189ccd5e9c891f8dee7a14 (patch) | |
| tree | 1d74a4c02a5562fbb2989c5a7d17269c1f40161d /sql/ha_berkeley.cc | |
| parent | 098a1e3afa7a911c39dca37bad084f6c171f7c44 (diff) | |
| parent | afe29967e03d5c936c378fff9ea4e4bcf7e9251e (diff) | |
| download | mariadb-git-fb987c8907c55d974b189ccd5e9c891f8dee7a14.tar.gz | |
Merge
sql/ha_berkeley.cc:
Auto merged
mysql-test/r/bdb.result:
SCCS merged
mysql-test/t/bdb.test:
SCCS merged
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 18af688d07c..b307b3a4b75 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -720,8 +720,8 @@ void ha_berkeley::unpack_key(char *record, DBT *key, uint index) } record[key_part->null_offset]&= ~key_part->null_bit; } - pos= (char*) key_part->field->unpack(record + key_part->field->offset(), - pos); + pos= (char*) key_part->field->unpack_key(record + key_part->field->offset(), + pos, key_part->length); } } |