← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

merged with latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
391
391
  */
392
392
  old_map= table->use_all_columns(table->read_set);
393
393
 
394
 
  for (ptr=table->field ; (field= *ptr); ptr++)
 
394
  for (ptr= table->getFields() ; (field= *ptr); ptr++)
395
395
  {
396
396
    uint32_t flags = field->flags;
397
397
 
398
 
    if (ptr != table->field)
 
398
    if (ptr != table->getFields())
399
399
      packet->append(STRING_WITH_LEN(",\n"));
400
400
 
401
401
    packet->append(STRING_WITH_LEN("  "));
476
476
  cursor->update_create_info(&create_info);
477
477
  primary_key= table->getShare()->primary_key;
478
478
 
479
 
  for (uint32_t i=0 ; i < table->getShare()->keys ; i++,key_info++)
 
479
  for (uint32_t i=0 ; i < table->getShare()->sizeKeys() ; i++,key_info++)
480
480
  {
481
481
    KeyPartInfo *key_part= key_info->key_part;
482
482
    bool found_primary=0;
511
511
                                  strlen(key_part->field->field_name));
512
512
      if (key_part->field &&
513
513
          (key_part->length !=
514
 
           table->field[key_part->fieldnr-1]->key_length()))
 
514
           table->getField(key_part->fieldnr-1)->key_length()))
515
515
      {
516
516
        buff.assign("(");
517
517
        buff.append(to_string((int32_t) key_part->length /