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

addresses #1619

rename compare_field to compare_toku_field

git-svn-id: file:///svn/mysql/tokudb-engine/src@10862 c7de825b-a66e-492c-adef-691d508d4ae1
parent 053db385
...@@ -548,7 +548,7 @@ inline int cmp_toku_varstring( ...@@ -548,7 +548,7 @@ inline int cmp_toku_varstring(
return ret_val; return ret_val;
} }
int compare_field( inline int compare_toku_field(
uchar* a_buf, uchar* a_buf,
uchar* b_buf, uchar* b_buf,
Field* field, Field* field,
...@@ -903,7 +903,7 @@ int tokudb_compare_two_keys( ...@@ -903,7 +903,7 @@ int tokudb_compare_two_keys(
saved_key_length--; saved_key_length--;
if (!*new_key_ptr++) { continue; } if (!*new_key_ptr++) { continue; }
} }
cmp = compare_field( cmp = compare_toku_field(
new_key_ptr, new_key_ptr,
saved_key_ptr, saved_key_ptr,
key_part->field, key_part->field,
...@@ -980,7 +980,7 @@ int tokudb_compare_two_clustered_keys(KEY *key, KEY* primary_key, const DBT * ne ...@@ -980,7 +980,7 @@ int tokudb_compare_two_clustered_keys(KEY *key, KEY* primary_key, const DBT * ne
saved_key_length--; saved_key_length--;
if (!*new_key_ptr++) { continue; } if (!*new_key_ptr++) { continue; }
} }
cmp = compare_field( cmp = compare_toku_field(
new_key_ptr, new_key_ptr,
saved_key_ptr, saved_key_ptr,
key_part->field, key_part->field,
...@@ -1041,7 +1041,7 @@ int tokudb_compare_two_clustered_keys(KEY *key, KEY* primary_key, const DBT * ne ...@@ -1041,7 +1041,7 @@ int tokudb_compare_two_clustered_keys(KEY *key, KEY* primary_key, const DBT * ne
saved_key_length--; saved_key_length--;
if (!*new_key_ptr++) { continue; } if (!*new_key_ptr++) { continue; }
} }
cmp = compare_field( cmp = compare_toku_field(
new_key_ptr, new_key_ptr,
saved_key_ptr, saved_key_ptr,
key_part->field, key_part->field,
......
...@@ -28,7 +28,6 @@ typedef enum { ...@@ -28,7 +28,6 @@ typedef enum {
inline TOKU_TYPE mysql_to_toku_type (enum_field_types mysql_type); inline TOKU_TYPE mysql_to_toku_type (enum_field_types mysql_type);
int compare_field(uchar* a_buf, Field* a_field, uchar* b_buf, Field* b_field);
uchar* pack_toku_field( uchar* pack_toku_field(
uchar* to_tokudb, uchar* to_tokudb,
......
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