addresses #1602

merge change to main

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

storage/tokudb/ha_tokudb.cc

@@ -1674,8 +1674,8 @@ int ha_tokudb::cmp_ref(const uchar * ref1, const uchar * ref2) {
         *(u_int32_t *)ref1,
         ref2 + sizeof(u_int32_t),
         *(u_int32_t *)ref2,
-        (uchar *)share->file->descriptor.data + 4,
-        *(u_int32_t *)share->file->descriptor.data - 4,
+        (uchar *)share->file->descriptor->data + 4,
+        *(u_int32_t *)share->file->descriptor->data - 4,
         false
         );
     return ret_val;

storage/tokudb/hatoku_cmp.cc

@@ -1389,22 +1389,22 @@ int tokudb_cmp_dbt_key(DB *file, const DBT *keya, const DBT *keyb) {
         keya->size, 
         keyb->data,
         keyb->size,
-        (uchar *)file->descriptor.data + 4,
-        (*(u_int32_t *)file->descriptor.data) - 4,
+        (uchar *)file->descriptor->data + 4,
+        (*(u_int32_t *)file->descriptor->data) - 4,
         false
         );
     return cmp;
 }
 
 int tokudb_cmp_dbt_data(DB *file, const DBT *keya, const DBT *keyb) {
-    int row_desc_offset = *(u_int32_t *)file->descriptor.data;
+    int row_desc_offset = *(u_int32_t *)file->descriptor->data;
     int cmp = tokudb_compare_two_keys(
         keya->data, 
         keya->size, 
         keyb->data,
         keyb->size,
-        (uchar *)file->descriptor.data + row_desc_offset,
-        file->descriptor.size - row_desc_offset,
+        (uchar *)file->descriptor->data + row_desc_offset,
+        file->descriptor->size - row_desc_offset,
         false
         );
     return cmp;
@@ -1417,8 +1417,8 @@ int tokudb_prefix_cmp_dbt_key(DB *file, const DBT *keya, const DBT *keyb) {
         keya->size, 
         keyb->data,
         keyb->size,
-        (uchar *)file->descriptor.data + 4,
-        *(u_int32_t *)file->descriptor.data - 4,
+        (uchar *)file->descriptor->data + 4,
+        *(u_int32_t *)file->descriptor->data - 4,
         true
         );
     return cmp;