← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/archive/ha_archive.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:
plugin/archive/ha_archive.cc
655
655
       ptr != end ;
656
656
       ptr++)
657
657
  {
658
 
      length += 2 + ((Field_blob*)table->field[*ptr])->get_length();
 
658
      length += 2 + ((Field_blob*)table->getField(*ptr))->get_length();
659
659
  }
660
660
 
661
661
  return length;
673
673
  memcpy(record_buffer->buffer, record, table->getShare()->null_bytes);
674
674
  ptr= record_buffer->buffer + table->getShare()->null_bytes;
675
675
 
676
 
  for (Field **field=table->field ; *field ; field++)
 
676
  for (Field **field=table->getFields() ; *field ; field++)
677
677
  {
678
678
    if (!((*field)->is_null()))
679
679
      ptr= (*field)->pack(ptr, record + (*field)->offset(record));
890
890
  /* Copy null bits */
891
891
  memcpy(record, ptr, table->getNullBytes());
892
892
  ptr+= table->getNullBytes();
893
 
  for (Field **field=table->field ; *field ; field++)
 
893
  for (Field **field= table->getFields() ; *field ; field++)
894
894
  {
895
895
    if (!((*field)->is_null()))
896
896
    {