diff options
| author | monty@donna.mysql.com <> | 2001-02-15 03:43:14 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-02-15 03:43:14 +0200 |
| commit | 450d98e3418fc3e267833d3ad13d45b539269fac (patch) | |
| tree | 48461790e73014dbea005fbd6ef8d48e83cc6f14 /sql/ha_berkeley.cc | |
| parent | 7de40020d7684af7ec139455ca99ce6480f434e0 (diff) | |
| download | mariadb-git-450d98e3418fc3e267833d3ad13d45b539269fac.tar.gz | |
Changed --replace to --replace_result in mysqltest
Changed errmsg -> my_errmsg (portability issue)
Fixed that mysqlbinlog writes SET TIMESTAMP before all queries
Fixed comments in default my.cnf files
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 9f31064cc54..9a6df95193a 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -779,6 +779,7 @@ DBT *ha_berkeley::pack_key(DBT *key, uint keynr, char *buff, for (; key_part != end && (int) key_length > 0 ; key_part++) { + uint offset=0; if (key_part->null_bit) { if (!(*buff++ = (*key_ptr == 0))) // Store 0 if NULL @@ -788,9 +789,9 @@ DBT *ha_berkeley::pack_key(DBT *key, uint keynr, char *buff, key->flags|=DB_DBT_DUPOK; continue; } - key_ptr++; + offset=1; // Data is at key_ptr+1 } - buff=key_part->field->pack_key_from_key_image(buff,key_ptr, + buff=key_part->field->pack_key_from_key_image(buff,key_ptr+offset, key_part->length); key_ptr+=key_part->store_length; key_length-=key_part->store_length; |