← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.cc

  • Committer: Brian Aker
  • Date: 2010-06-05 00:14:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1592.
  • Revision ID: brian@gir-20100605001439-kn5v6oaspacx5q6l
Merge in change to getTable() to private the field objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.cc
1632
1632
    goto err;
1633
1633
  }
1634
1634
 
1635
 
  outparam.field= field_ptr;
 
1635
  outparam.setFields(field_ptr);
1636
1636
 
1637
1637
  record= (unsigned char*) outparam.record[0]-1;        /* Fieldstart = 1 */
1638
1638
 
1648
1648
 
1649
1649
  if (found_next_number_field)
1650
1650
    outparam.found_next_number_field=
1651
 
      outparam.field[positionFields(found_next_number_field)];
 
1651
      outparam.getField(positionFields(found_next_number_field));
1652
1652
  if (timestamp_field)
1653
 
    outparam.timestamp_field= (Field_timestamp*) outparam.field[timestamp_field_offset];
 
1653
    outparam.timestamp_field= (Field_timestamp*) outparam.getField(timestamp_field_offset);
1654
1654
 
1655
1655
 
1656
1656
  /* Fix key->name and key_part->field */
1682
1682
           key_part < key_part_end ;
1683
1683
           key_part++)
1684
1684
      {
1685
 
        Field *local_field= key_part->field= outparam.field[key_part->fieldnr-1];
 
1685
        Field *local_field= key_part->field= outparam.getField(key_part->fieldnr-1);
1686
1686
 
1687
1687
        if (local_field->key_length() != key_part->length &&
1688
1688
            !(local_field->flags & BLOB_FLAG))