Commit f7779a07 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses #1619

remove all references to unpack_key, pack_key, and pack_key_from_key_image

git-svn-id: file:///svn/mysql/tokudb-engine/src@10857 c7de825b-a66e-492c-adef-691d508d4ae1
parent 8ec56a90
...@@ -621,10 +621,7 @@ int compare_field( ...@@ -621,10 +621,7 @@ int compare_field(
); );
goto exit; goto exit;
default: default:
*a_bytes_read = field->packed_col_length(a_buf, key_part_length); assert(false);
*b_bytes_read = field->packed_col_length(b_buf, key_part_length);
ret_val = field->pack_cmp(a_buf, b_buf, key_part_length, 0);
goto exit;
} }
assert(false); assert(false);
exit: exit:
...@@ -720,14 +717,7 @@ uchar* pack_toku_field( ...@@ -720,14 +717,7 @@ uchar* pack_toku_field(
); );
goto exit; goto exit;
default: default:
assert(toku_type == toku_type_unknown); assert(false);
new_pos = field->pack_key(
to_tokudb,
from_mysql,
key_part_length,
TRUE
);
goto exit;
} }
assert(false); assert(false);
exit: exit:
...@@ -774,15 +764,9 @@ uchar* pack_key_toku_field( ...@@ -774,15 +764,9 @@ uchar* pack_key_toku_field(
); );
goto exit; goto exit;
default: default:
assert(toku_type == toku_type_unknown); assert(false);
new_pos= field->pack_key_from_key_image(
to_tokudb,
from_mysql,
key_part_length,
true
);
goto exit;
} }
assert(false); assert(false);
exit: exit:
return new_pos; return new_pos;
...@@ -855,14 +839,7 @@ uchar* unpack_toku_field( ...@@ -855,14 +839,7 @@ uchar* unpack_toku_field(
); );
goto exit; goto exit;
default: default:
assert(toku_type == toku_type_unknown); assert(false);
new_pos = (uchar *) field->unpack_key(
to_mysql,
from_tokudb,
key_part_length,
TRUE
);
goto exit;
} }
assert(false); assert(false);
exit: exit:
......
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