← 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: 2010-05-15 00:44:51 UTC
  • Revision ID: brian@gaz-20100515004451-hacli300cjtbmjo0
Remove of KeyPartInfo

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
541
541
void Table::mark_columns_used_by_index_no_reset(uint32_t index,
542
542
                                                MyBitmap *bitmap)
543
543
{
544
 
  KEY_PART_INFO *key_part= key_info[index].key_part;
545
 
  KEY_PART_INFO *key_part_end= (key_part +
 
544
  KeyPartInfo *key_part= key_info[index].key_part;
 
545
  KeyPartInfo *key_part_end= (key_part +
546
546
                                key_info[index].key_parts);
547
547
  for (;key_part != key_part_end; key_part++)
548
548
    bitmap->setBit(key_part->fieldnr-1);
834
834
  uint32_t *blob_field;
835
835
  CopyField *copy= 0;
836
836
  KEY *keyinfo;
837
 
  KEY_PART_INFO *key_part_info;
 
837
  KeyPartInfo *key_part_info;
838
838
  Item **copy_func;
839
839
  MI_COLUMNDEF *recinfo;
840
840
  uint32_t total_uneven_bit_length= 0;
1362
1362
                         (share->uniques ? test(null_pack_length) : 0));
1363
1363
    table->distinct= 1;
1364
1364
    share->keys= 1;
1365
 
    if (!(key_part_info= (KEY_PART_INFO*)
1366
 
         table->mem_root.alloc_root(keyinfo->key_parts * sizeof(KEY_PART_INFO))))
 
1365
    if (!(key_part_info= (KeyPartInfo*)
 
1366
         table->mem_root.alloc_root(keyinfo->key_parts * sizeof(KeyPartInfo))))
1367
1367
      goto err;
1368
 
    memset(key_part_info, 0, keyinfo->key_parts * sizeof(KEY_PART_INFO));
 
1368
    memset(key_part_info, 0, keyinfo->key_parts * sizeof(KeyPartInfo));
1369
1369
    table->key_info=keyinfo;
1370
1370
    keyinfo->key_part=key_part_info;
1371
1371
    keyinfo->flags=HA_NOSAME | HA_NULL_ARE_EQUAL;