← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
309
309
  switch(create_info->row_type)
310
310
  {
311
311
  case ROW_TYPE_DEFAULT:
312
 
    table_options->set_row_type(message::Table::TableOptions::ROW_TYPE_DEFAULT);
 
312
    /* No use setting a default row type... just adds redundant info to message */
313
313
    break;
314
314
  case ROW_TYPE_FIXED:
315
315
    table_options->set_row_type(message::Table::TableOptions::ROW_TYPE_FIXED);
333
333
    abort();
334
334
  }
335
335
 
336
 
  table_options->set_pack_record(create_info->table_options
337
 
                                 & HA_OPTION_PACK_RECORD);
 
336
  if (create_info->table_options & HA_OPTION_PACK_RECORD)
 
337
    table_options->set_pack_record(true);
338
338
 
339
339
  if (table_options->has_comment())
340
340
  {
447
447
 
448
448
      idx->set_comment(key_info[i].comment.str);
449
449
    }
450
 
    if(key_info[i].flags & ~(HA_NOSAME | HA_PACK_KEY | HA_USES_BLOCK_SIZE | HA_BINARY_PACK_KEY | HA_VAR_LENGTH_PART | HA_NULL_PART_KEY | HA_KEY_HAS_PART_KEY_SEG | HA_GENERATED_KEY | HA_USES_COMMENT))
 
450
    if (key_info[i].flags & 
 
451
        ~(HA_NOSAME | HA_PACK_KEY | HA_USES_BLOCK_SIZE | 
 
452
          HA_BINARY_PACK_KEY | HA_VAR_LENGTH_PART | HA_NULL_PART_KEY | 
 
453
          HA_KEY_HAS_PART_KEY_SEG | HA_GENERATED_KEY | HA_USES_COMMENT))
451
454
      abort(); // Invalid (unknown) index flag.
452
455
 
453
456
    for(unsigned int j=0; j< key_info[i].key_parts; j++)