← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto.cc

  • Committer: Mark Atwood
  • Date: 2011-08-21 06:56:57 UTC
  • mfrom: (2385.3.34 rf)
  • Revision ID: me@mark.atwood.name-20110821065657-vk2at03z9u17mf1d
merge lp:~olafvdspek/drizzle/refactor7

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto.cc
406
406
 
407
407
  for (uint32_t i= 0; i < keys; i++)
408
408
  {
409
 
    message::Table::Index *idx;
410
 
 
411
 
    idx= table_proto.add_indexes();
412
 
 
413
 
    assert(test(key_info[i].flags & HA_USES_COMMENT) ==
414
 
           (key_info[i].comment.length > 0));
 
409
    message::Table::Index *idx= table_proto.add_indexes();
 
410
 
 
411
    assert(test(key_info[i].flags & HA_USES_COMMENT) == (key_info[i].comment.length > 0));
415
412
 
416
413
    idx->set_name(key_info[i].name);
417
 
 
418
414
    idx->set_key_length(key_info[i].key_length);
419
 
 
420
 
    if (is_primary_key_name(key_info[i].name))
421
 
      idx->set_is_primary(true);
422
 
    else
423
 
      idx->set_is_primary(false);
 
415
    idx->set_is_primary(is_primary_key(key_info[i].name));
424
416
 
425
417
    switch(key_info[i].algorithm)
426
418
    {