← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 09:33:49 UTC
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329093349-oz4cgb9f7l1032m3
Fix Drizzle to compile in GCC 4.6 (which fires warnings and therefore errors if a variable is set and not read)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
83
83
{
84
84
  int lock_error,kfile,open_mode,save_errno,have_rtree=0;
85
85
  uint32_t i,j,len,errpos,head_length,base_pos,offset,info_length,keys,
86
 
    key_parts,unique_key_parts,fulltext_keys,uniques;
 
86
    key_parts,unique_key_parts,uniques;
87
87
  char name_buff[FN_REFLEN], org_name[FN_REFLEN], index_name[FN_REFLEN],
88
88
       data_name[FN_REFLEN], rp_buff[PATH_MAX];
89
89
  unsigned char *disk_cache= NULL;
184
184
    len=mi_uint2korr(share->state.header.state_info_length);
185
185
    keys=    (uint) share->state.header.keys;
186
186
    uniques= (uint) share->state.header.uniques;
187
 
    fulltext_keys= (uint) share->state.header.fulltext_keys;
188
187
    key_parts= mi_uint2korr(share->state.header.key_parts);
189
188
    unique_key_parts= mi_uint2korr(share->state.header.unique_key_parts);
190
189
    share->state_diff_length=len-MI_STATE_INFO_SIZE;