← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/csv/ha_tina.cc

  • Committer: Monty Taylor
  • Date: 2008-11-19 08:44:26 UTC
  • mfrom: (584.5.1 fix-headers)
  • mto: This revision was merged to the branch mainline in revision 590.
  • Revision ID: monty@inaugust.com-20081119084426-zdambea9ya8aac63
Merged in fix-headers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/csv/ha_tina.cc
42
42
*/
43
43
#include <drizzled/common_includes.h>
44
44
#include <drizzled/field.h>
45
 
#include "ha_tina.h"
 
45
#include <drizzled/field/blob.h>
 
46
#include <drizzled/field/timestamp.h>
 
47
#include <storage/csv/ha_tina.h>
46
48
#include <drizzled/error.h>
47
49
#include <drizzled/table.h>
48
50
#include <drizzled/session.h>
600
602
  for (Field **field=table->field ; *field ; field++)
601
603
  {
602
604
    char curr_char;
603
 
    
 
605
 
604
606
    buffer.length(0);
605
607
    if (curr_offset >= end_offset)
606
608
      goto err;
648
650
        }
649
651
      }
650
652
    }
651
 
    else 
 
653
    else
652
654
    {
653
655
      for(; curr_offset < end_offset; curr_offset++)
654
656
      {
672
674
        Field_blob *blob= *(Field_blob**) field;
673
675
        unsigned char *src, *tgt;
674
676
        uint32_t length, packlength;
675
 
        
 
677
 
676
678
        packlength= blob->pack_length_no_ptr();
677
679
        length= blob->get_length(blob->ptr);
678
680
        memcpy(&src, blob->ptr + packlength, sizeof(char*));