~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2009-08-17 06:21:44 UTC
  • mto: This revision was merged to the branch mainline in revision 1118.
  • Revision ID: brian@gaz-20090817062144-8lxn1sg93pd8nhev
Remove PACK_KEYS

Show diffs side-by-side

added added

removed removed

Lines of Context:
3086
3086
  List_iterator<CreateField> find_it(new_create_list);
3087
3087
  List_iterator<CreateField> field_it(new_create_list);
3088
3088
  List<Key_part_spec> key_parts;
3089
 
  uint32_t db_create_options= (table->s->db_create_options
3090
 
                           & ~(HA_OPTION_PACK_RECORD));
3091
3089
  uint32_t used_fields= create_info->used_fields;
3092
3090
  KEY *key_info=table->key_info;
3093
3091
  bool rc= true;
3411
3409
  }
3412
3410
 
3413
3411
  table->file->update_create_info(create_info);
3414
 
  if ((create_info->table_options &
3415
 
       (HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS)) ||
3416
 
      (used_fields & HA_CREATE_USED_PACK_KEYS))
3417
 
    db_create_options&= ~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS);
3418
 
  create_info->table_options|= db_create_options;
3419
3412
 
3420
3413
  if (table->s->tmp_table)
3421
3414
    create_info->options|=HA_LEX_CREATE_TMP_TABLE;