Commit 340a1971 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses #1619

remove toku_type_decimal and toku_type_bitstream
They were unneeded.

git-svn-id: file:///svn/mysql/tokudb-engine/src@10859 c7de825b-a66e-492c-adef-691d508d4ae1
parent cf499e33
...@@ -32,10 +32,8 @@ inline TOKU_TYPE mysql_to_toku_type (Field* field) { ...@@ -32,10 +32,8 @@ inline TOKU_TYPE mysql_to_toku_type (Field* field) {
ret_val = toku_type_float; ret_val = toku_type_float;
goto exit; goto exit;
case MYSQL_TYPE_NEWDECIMAL: case MYSQL_TYPE_NEWDECIMAL:
ret_val = toku_type_decimal;
goto exit;
case MYSQL_TYPE_BIT: case MYSQL_TYPE_BIT:
ret_val = toku_type_bitstream; ret_val = toku_type_fixbinary;
goto exit; goto exit;
case MYSQL_TYPE_STRING: case MYSQL_TYPE_STRING:
if (field->binary()) { if (field->binary()) {
...@@ -579,8 +577,6 @@ int compare_field( ...@@ -579,8 +577,6 @@ int compare_field(
*a_bytes_read = sizeof(double); *a_bytes_read = sizeof(double);
*b_bytes_read = sizeof(double); *b_bytes_read = sizeof(double);
goto exit; goto exit;
case (toku_type_decimal):
case (toku_type_bitstream):
case (toku_type_fixbinary): case (toku_type_fixbinary):
num_bytes = field->pack_length(); num_bytes = field->pack_length();
set_if_smaller(num_bytes, key_part_length); set_if_smaller(num_bytes, key_part_length);
...@@ -664,8 +660,6 @@ uchar* pack_toku_field( ...@@ -664,8 +660,6 @@ uchar* pack_toku_field(
assert(key_part_length == sizeof(float)); assert(key_part_length == sizeof(float));
new_pos = pack_toku_float(to_tokudb, from_mysql); new_pos = pack_toku_float(to_tokudb, from_mysql);
goto exit; goto exit;
case (toku_type_decimal):
case (toku_type_bitstream):
case (toku_type_fixbinary): case (toku_type_fixbinary):
num_bytes = field->pack_length(); num_bytes = field->pack_length();
set_if_smaller(num_bytes, key_part_length); set_if_smaller(num_bytes, key_part_length);
...@@ -737,8 +731,6 @@ uchar* pack_key_toku_field( ...@@ -737,8 +731,6 @@ uchar* pack_key_toku_field(
case (toku_type_int): case (toku_type_int):
case (toku_type_double): case (toku_type_double):
case (toku_type_float): case (toku_type_float):
case (toku_type_decimal):
case (toku_type_bitstream):
case (toku_type_fixbinary): case (toku_type_fixbinary):
case (toku_type_fixstring): case (toku_type_fixstring):
new_pos = pack_toku_field(to_tokudb, from_mysql, field, key_part_length); new_pos = pack_toku_field(to_tokudb, from_mysql, field, key_part_length);
...@@ -802,8 +794,6 @@ uchar* unpack_toku_field( ...@@ -802,8 +794,6 @@ uchar* unpack_toku_field(
assert(key_part_length == sizeof(float)); assert(key_part_length == sizeof(float));
new_pos = unpack_toku_float(to_mysql, from_tokudb); new_pos = unpack_toku_float(to_mysql, from_tokudb);
goto exit; goto exit;
case (toku_type_decimal):
case (toku_type_bitstream):
case (toku_type_fixbinary): case (toku_type_fixbinary):
num_bytes = field->pack_length(); num_bytes = field->pack_length();
set_if_smaller(num_bytes, key_part_length); set_if_smaller(num_bytes, key_part_length);
......
...@@ -17,8 +17,6 @@ typedef enum { ...@@ -17,8 +17,6 @@ typedef enum {
toku_type_int = 0, toku_type_int = 0,
toku_type_double, toku_type_double,
toku_type_float, toku_type_float,
toku_type_decimal,
toku_type_bitstream,
toku_type_fixbinary, toku_type_fixbinary,
toku_type_fixstring, toku_type_fixstring,
toku_type_varbinary, toku_type_varbinary,
......
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