← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/csv/ha_tina.cc

  • Committer: Brian Aker
  • Date: 2008-08-19 15:11:04 UTC
  • mfrom: (327.2.6 drizzle-good)
  • Revision ID: brian@gir.tangent.org-20080819151104-uxk5lgoaj0fwgx9z
Merge of Brian's tree to main tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/csv/ha_tina.cc
449
449
  String attribute(attribute_buffer, sizeof(attribute_buffer),
450
450
                   &my_charset_bin);
451
451
 
452
 
  my_bitmap_map *org_bitmap= dbug_tmp_use_all_columns(table, table->read_set);
453
452
  buffer.length(0);
454
453
 
455
454
  for (Field **field=table->field ; *field ; field++)
524
523
 
525
524
  //buffer.replace(buffer.length(), 0, "\n", 1);
526
525
 
527
 
  dbug_tmp_restore_column_map(table->read_set, org_bitmap);
528
526
  return (buffer.length());
529
527
}
530
528
 
577
575
{
578
576
  off_t end_offset, curr_offset= current_position;
579
577
  int eoln_len;
580
 
  my_bitmap_map *org_bitmap;
581
578
  int error;
582
579
  bool read_all;
583
580
 
594
591
 
595
592
  /* We must read all columns in case a table is opened for update */
596
593
  read_all= !bitmap_is_clear_all(table->write_set);
597
 
  /* Avoid asserts in ::store() for columns that are not going to be updated */
598
 
  org_bitmap= dbug_tmp_use_all_columns(table, table->write_set);
599
594
  error= HA_ERR_CRASHED_ON_USAGE;
600
595
 
601
596
  memset(buf, 0, table->s->null_bytes);
692
687
  error= 0;
693
688
 
694
689
err:
695
 
  dbug_tmp_restore_column_map(table->write_set, org_bitmap);
696
690
 
697
691
  return(error);
698
692
}