← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/file_exchange.h

  • Committer: Mark Atwood
  • Date: 2011-10-14 15:59:08 UTC
  • mfrom: (2430.1.12 refactor3a)
  • Revision ID: me@mark.atwood.name-20111014155908-whqmrmaf2grpsg5c
merge lp:~olafvdspek/drizzle/refactor3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/file_exchange.h
38
38
  XXX: We never call destructor for objects of this class.
39
39
*/
40
40
 
41
 
class file_exchange :
42
 
  public memory::SqlAlloc
 
41
class file_exchange : public memory::SqlAlloc
43
42
{
44
43
public:
45
 
  enum enum_filetype filetype; /* load XML, Added by Arnold & Erik */
46
 
  char *file_name;
 
44
  enum_filetype filetype; /* load XML, Added by Arnold & Erik */
 
45
  const char *file_name;
47
46
  String *field_term,*enclosed,*line_term,*line_start,*escaped;
48
47
  bool opt_enclosed;
49
48
  bool dumpfile;
50
49
  ulong skip_lines;
51
 
  const charset_info_st *cs;
52
 
  file_exchange(char *name, bool flag,
53
 
                enum_filetype filetype_arg= FILETYPE_CSV);
 
50
  const charset_info_st* cs;
 
51
  file_exchange(const char *name, bool flag, enum_filetype filetype_arg= FILETYPE_CSV);
54
52
};
55
53
 
56
54