addresses #1619

better function names

git-svn-id: file:///svn/mysql/tokudb-engine/src@10842 c7de825b-a66e-492c-adef-691d508d4ae1

storage/tokudb/ha_tokudb.cc

@@ -1283,7 +1283,7 @@ u_int32_t ha_tokudb::place_key_into_mysql_buff(KEY* key_info, uchar * record, uc
         // HOPEFULLY TEMPORARY
         //
         assert(table->s->db_low_byte_first);
-        pos = unpack_field(
+        pos = unpack_toku_field(
             record + field_offset(key_part->field, table),
             pos,
             key_part->field,
@@ -1356,7 +1356,7 @@ u_int32_t ha_tokudb::place_key_into_dbt_buff(KEY* key_info, uchar * buff, const
         // because key_part->offset is SET INCORRECTLY in add_index
         // filed ticket 862 to look into this
         //
-        curr_buff = pack_field(
+        curr_buff = pack_toku_field(
             curr_buff,
             (uchar *) (record + field_offset(key_part->field, table)),
             key_part->field,
@@ -1493,7 +1493,7 @@ DBT *ha_tokudb::pack_key(DBT * key, uint keynr, uchar * buff, const uchar * key_
         }
         assert(table->s->db_low_byte_first);
 
-        buff = pack_key_field(
+        buff = pack_key_toku_field(
             buff,
             (uchar *) key_ptr + offset,
             key_part->field,

storage/tokudb/hatoku_cmp.cc

@@ -408,7 +408,7 @@ inline uchar* unpack_toku_varbinary(
     uchar* to_mysql, 
     uchar* from_tokudb, 
     u_int32_t length_bytes_in_tokudb, // number of bytes used to encode length in from_tokudb
-    u_int32_t length_bytes_in_mysql // number of bytes used to encode length in to_tokudb
+    u_int32_t length_bytes_in_mysql // number of bytes used to encode length in to_mysql
     ) 
 {
     u_int32_t length = get_length_from_var_tokudata(from_tokudb, length_bytes_in_tokudb);
@@ -568,7 +568,7 @@ int compare_field(
 // cannot do it until all functions converted, because until
 // then, still relying on field->pack_cmp
 //
-uchar* pack_field(
+uchar* pack_toku_field(
     uchar* to_tokudb,
     uchar* from_mysql,
     Field* field,
@@ -643,7 +643,7 @@ uchar* pack_field(
     return new_pos;
 }
 
-uchar* pack_key_field(
+uchar* pack_key_toku_field(
     uchar* to_tokudb,
     uchar* from_mysql,
     Field* field,
@@ -660,7 +660,7 @@ uchar* pack_key_field(
     case (toku_type_bitstream):
     case (toku_type_fixbinary):
     case (toku_type_fixstring):
-        new_pos = pack_field(to_tokudb, from_mysql, field, key_part_length);
+        new_pos = pack_toku_field(to_tokudb, from_mysql, field, key_part_length);
         goto exit;
     case (toku_type_varbinary):
     case (toku_type_varstring):
@@ -689,7 +689,7 @@ uchar* pack_key_field(
 }
 
 
-uchar* unpack_field(
+uchar* unpack_toku_field(
     uchar* to_mysql,
     uchar* from_tokudb,
     Field* field,

storage/tokudb/hatoku_cmp.h

@@ -32,21 +32,21 @@ 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_field(
+uchar* pack_toku_field(
     uchar* to_tokudb,
     uchar* from_mysql,
     Field* field,
     u_int32_t key_part_length //I really hope this is temporary as I phase out the pack_cmp stuff
     );
 
-uchar* pack_key_field(
+uchar* pack_key_toku_field(
     uchar* to_tokudb,
     uchar* from_mysql,
     Field* field,
     u_int32_t key_part_length //I really hope this is temporary as I phase out the pack_cmp stuff
     );
 
-uchar* unpack_field(
+uchar* unpack_toku_field(
     uchar* to_mysql,
     uchar* from_tokudb,
     Field* field,