← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2011-03-28 02:46:21 UTC
  • Revision ID: brian@tangent.org-20110328024621-wtkdtlvdplqm0ybf
Shift CHARSET_INFO to charset_info_st

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
62
62
  bool error,line_cuted,found_null,enclosed;
63
63
  unsigned char *row_start,                     /* Found row starts here */
64
64
        *row_end;                       /* Found row ends here */
65
 
  const CHARSET_INFO *read_charset;
 
65
  const charset_info_st *read_charset;
66
66
 
67
 
  READ_INFO(int cursor, size_t tot_length, const CHARSET_INFO * const cs,
 
67
  READ_INFO(int cursor, size_t tot_length, const charset_info_st * const cs,
68
68
            String &field_term,String &line_start,String &line_term,
69
69
            String &enclosed,int escape, bool is_fifo);
70
70
  ~READ_INFO();
763
763
 
764
764
 
765
765
READ_INFO::READ_INFO(int file_par, size_t tot_length,
766
 
                     const CHARSET_INFO * const cs,
 
766
                     const charset_info_st * const cs,
767
767
                     String &field_term, String &line_start, String &line_term,
768
768
                     String &enclosed_par, int escape, bool is_fifo)
769
769
  :cursor(file_par),escape_char(escape)