← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_open.c

  • Committer: Brian Aker
  • Date: 2008-07-06 06:21:04 UTC
  • Revision ID: brian@tangent.org-20080706062104-94iqawllrm0n9uxo
More removal of FT from MyISAM

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_open.c
325
325
        disk_pos=mi_keydef_read(disk_pos, &share->keyinfo[i]);
326
326
        disk_pos_assert(disk_pos + share->keyinfo[i].keysegs * HA_KEYSEG_SIZE,
327
327
                        end_pos);
328
 
        if (share->keyinfo[i].key_alg == HA_KEY_ALG_RTREE)
329
 
          have_rtree=1;
330
328
        set_if_smaller(share->blocksize,share->keyinfo[i].block_length);
331
329
        share->keyinfo[i].seg=pos;
332
330
        for (j=0 ; j < share->keyinfo[i].keysegs; j++,pos++)
474
472
        ((share->options & (HA_OPTION_READ_ONLY_DATA | HA_OPTION_TMP_TABLE |
475
473
                           HA_OPTION_COMPRESS_RECORD |
476
474
                           HA_OPTION_TEMP_COMPRESS_RECORD)) ||
477
 
         (open_flags & HA_OPEN_TMP_TABLE) ||
478
 
         have_rtree) ? 0 : 1;
 
475
         (open_flags & HA_OPEN_TMP_TABLE) || have_rtree) ? 0 : 1;
479
476
      if (share->concurrent_insert)
480
477
      {
481
478
        share->lock.get_status=mi_get_status;