← 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-08 04:50:51 UTC
  • mfrom: (2430.1.1 rf)
  • Revision ID: me@mark.atwood.name-20111008045051-6ha1qiy7k2a9c3jv
Tags: 2011.10.27
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

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