← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_create.cc

  • Committer: Monty Taylor
  • Date: 2009-12-15 19:19:16 UTC
  • mto: (1241.14.1 out-of-tree)
  • mto: This revision was merged to the branch mainline in revision 1250.
  • Revision ID: mordred@inaugust.com-20091215191916-8wz3s0eojmkpzuy4
Put my_off_t back... but this time localized only to myisam and mysys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_create.cc
55
55
  HA_KEYSEG *keyseg,tmp_keyseg;
56
56
  MI_COLUMNDEF *rec;
57
57
  ulong *rec_per_key_part;
58
 
  uint64_t key_root[HA_MAX_POSSIBLE_KEY],key_del[MI_MAX_KEY_BLOCK_SIZE];
 
58
  my_off_t key_root[HA_MAX_POSSIBLE_KEY],key_del[MI_MAX_KEY_BLOCK_SIZE];
59
59
  MI_CREATE_INFO tmp_create_info;
60
60
 
61
61
  if (!ci)
455
455
 
456
456
  /* max_data_file_length and max_key_file_length are recalculated on open */
457
457
  if (options & HA_OPTION_TMP_TABLE)
458
 
    share.base.max_data_file_length=(uint64_t) ci->data_file_length;
 
458
    share.base.max_data_file_length=(my_off_t) ci->data_file_length;
459
459
 
460
460
  share.base.min_block_length=
461
461
    (share.base.pack_reclength+3 < MI_EXTEND_BLOCK_LENGTH &&