diff options
| author | unknown <jimw@mysql.com> | 2006-04-10 20:18:12 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-04-10 20:18:12 -0700 |
| commit | 050100dfcacfd7eb5155431382c1839ded6ef5c2 (patch) | |
| tree | 3d6c9c7455434d9a8d5af5c98e6cccfab404915e /sql/key.cc | |
| parent | 0957814dc51ba3fbe141603770d8b4eb09c4db38 (diff) | |
| parent | e70d0971df3f8199da48764782ccd2c908d81f2b (diff) | |
| download | mariadb-git-050100dfcacfd7eb5155431382c1839ded6ef5c2.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/type_bit_innodb.result:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/key.cc:
Auto merged
sql/field.cc:
Resolve merge conflict
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/key.cc b/sql/key.cc index fd9e8a89b17..a407fff4840 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -192,7 +192,8 @@ void key_restore(byte *to_record, byte *from_key, KEY *key_info, Field_bit *field= (Field_bit *) (key_part->field); if (field->bit_len) { - uchar bits= *(from_key + key_part->length - field->field_length -1); + uchar bits= *(from_key + key_part->length - + field->pack_length_in_rec() - 1); set_rec_bits(bits, to_record + key_part->null_offset + (key_part->null_bit == 128), field->bit_ofs, field->bit_len); |