← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2009-12-03 02:08:38 UTC
  • mto: (1237.3.3 push)
  • mto: This revision was merged to the branch mainline in revision 1238.
  • Revision ID: brian@gaz-20091203020838-v2pen6n0prwo92i7
Clean up index interface before moving to SE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
390
390
    case message::Table::Index::BTREE:
391
391
      keyinfo->algorithm= HA_KEY_ALG_BTREE;
392
392
      break;
393
 
    case message::Table::Index::RTREE:
394
 
      keyinfo->algorithm= HA_KEY_ALG_RTREE;
395
 
      break;
396
393
    case message::Table::Index::HASH:
397
394
      keyinfo->algorithm= HA_KEY_ALG_HASH;
398
395
      break;
399
 
    case message::Table::Index::FULLTEXT:
400
 
      keyinfo->algorithm= HA_KEY_ALG_FULLTEXT;
401
396
 
402
397
    default:
403
398
      /* TODO: suitable warning ? */
1090
1085
        if (field->key_length() == key_part->length &&
1091
1086
            !(field->flags & BLOB_FLAG))
1092
1087
        {
1093
 
          if (handler_file->index_flags(key, i, 0) & HA_KEYREAD_ONLY)
 
1088
          if (handler_file->index_flags(key) & HA_KEYREAD_ONLY)
1094
1089
          {
1095
1090
            share->keys_for_keyread.set(key);
1096
1091
            field->part_of_key.set(key);
1097
1092
            field->part_of_key_not_clustered.set(key);
1098
1093
          }
1099
 
          if (handler_file->index_flags(key, i, 1) & HA_READ_ORDER)
 
1094
          if (handler_file->index_flags(key) & HA_READ_ORDER)
1100
1095
            field->part_of_sortkey.set(key);
1101
1096
        }
1102
1097
        if (!(key_part->key_part_flag & HA_REVERSE_SORT) &&