Commit 12a276cf authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses 977

previous fix was bad, undid it

git-svn-id: file:///svn/mysql/tokudb-engine/src@4880 c7de825b-a66e-492c-adef-691d508d4ae1
parent 4f1a0afa
...@@ -1483,19 +1483,9 @@ void ha_tokudb::unpack_key(uchar * record, DBT * key, uint index) { ...@@ -1483,19 +1483,9 @@ void ha_tokudb::unpack_key(uchar * record, DBT * key, uint index) {
/* tokutek change to make pack_key and unpack_key work for /* tokutek change to make pack_key and unpack_key work for
decimals */ decimals */
uint unpack_length = key_part->length; uint unpack_length = key_part->length;
//
// The following is considered a HACK until ticket 981 is resolved
// The function unpack_key seems to take as arguments
// dest, src, and length. At least that is what the signature looks like.
// However, Field::unpack_key forwards to Field::unpack, which
// seems to interpret the third param as a "param_data", whose schema
// can be retrieved with the function save_field_metadata.
// So, in the case of Field_new_decimal that does NOT take a length
// param, we do this. We need to get the spec resolved by MySQL
//
if (key_part->field->type() == MYSQL_TYPE_NEWDECIMAL) { if (key_part->field->type() == MYSQL_TYPE_NEWDECIMAL) {
unpack_length = 0; Field_new_decimal *field_nd = (Field_new_decimal *) key_part->field;
key_part->field->save_field_metadata((uchar *)(&unpack_length)); unpack_length += field_nd->precision << 8;
} }
pos = (uchar *) key_part->field->unpack_key(record + field_offset(key_part->field), pos, pos = (uchar *) key_part->field->unpack_key(record + field_offset(key_part->field), pos,
#if MYSQL_VERSION_ID < 50123 #if MYSQL_VERSION_ID < 50123
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment