mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

addresses #1619

Browse source 
fix fixstring type

git-svn-id: file:///svn/mysql/tokudb-engine/src@10856 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:01:48 -04:00 committed by Yoni Fogel
parent 7f3d9efae7
commit 8ec56a90d0
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
storage/tokudb/hatoku_cmp.cc
View file

@ -591,9 +591,14 @@ int compare_field(
case (toku_type_fixstring):
num_bytes = field->pack_length();
set_if_smaller(num_bytes, key_part_length);
ret_val = cmp_toku_string(a_buf, num_bytes, b_buf,num_bytes, field->charset()->number);
*a_bytes_read = num_bytes;
*b_bytes_read = num_bytes;
ret_val = cmp_toku_varstring(
a_buf,
b_buf,
get_length_bytes_from_max(num_bytes),
field->charset()->number,
a_bytes_read,
b_bytes_read
);
goto exit;
case (toku_type_varbinary):
ret_val = cmp_toku_varbinary(
@ -665,7 +670,6 @@ uchar* pack_toku_field(
case (toku_type_decimal):
case (toku_type_bitstream):
case (toku_type_fixbinary):
case (toku_type_fixstring):
num_bytes = field->pack_length();
set_if_smaller(num_bytes, key_part_length);
new_pos = pack_toku_binary(
@ -674,6 +678,18 @@ uchar* pack_toku_field(
num_bytes
);
goto exit;
case (toku_type_fixstring):
num_bytes = field->pack_length();
set_if_smaller(num_bytes, key_part_length);
new_pos = pack_toku_varstring(
to_tokudb,
from_mysql,
get_length_bytes_from_max(key_part_length),
0,
num_bytes,
field->charset()
);
goto exit;
case (toku_type_varbinary):
new_pos = pack_toku_varbinary(
to_tokudb,
@ -805,7 +821,6 @@ uchar* unpack_toku_field(
case (toku_type_decimal):
case (toku_type_bitstream):
case (toku_type_fixbinary):
case (toku_type_fixstring):
num_bytes = field->pack_length();
set_if_smaller(num_bytes, key_part_length);
new_pos = unpack_toku_binary(
@ -814,6 +829,14 @@ uchar* unpack_toku_field(
num_bytes
);
goto exit;
case (toku_type_fixstring):
new_pos = unpack_toku_varbinary(
to_mysql,
from_tokudb,
get_length_bytes_from_max(key_part_length),
0
);
goto exit;
case (toku_type_varbinary):
case (toku_type_varstring):
new_pos = unpack_toku_varbinary(