← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/file_exchange.h

Removed dependency for hex convert, fixed a few Protocol class issues for Solaris.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/file_exchange.h
21
21
#ifndef DRIZZLED_FILE_EXCHANGE_H
22
22
#define DRIZZLED_FILE_EXCHANGE_H
23
23
 
24
 
#include "drizzled/sql_string.h"
25
 
#include "drizzled/memory/sql_alloc.h"
26
 
#include "drizzled/enum.h"
27
 
 
28
 
namespace drizzled
29
 
{
30
 
 
31
 
extern const CHARSET_INFO *default_charset_info;
 
24
#include <drizzled/server_includes.h>
32
25
 
33
26
static String default_line_term("\n",default_charset_info);
34
27
static String default_escaped("\\",default_charset_info);
40
33
  XXX: We never call destructor for objects of this class.
41
34
*/
42
35
 
43
 
class file_exchange :
44
 
  public memory::SqlAlloc
 
36
class file_exchange :public Sql_alloc
45
37
{
46
38
public:
47
39
  enum enum_filetype filetype; /* load XML, Added by Arnold & Erik */
52
44
  ulong skip_lines;
53
45
  const CHARSET_INFO *cs;
54
46
  file_exchange(char *name, bool flag,
55
 
                enum_filetype filetype_arg= FILETYPE_CSV);
 
47
                enum_filetype filetype_arg= FILETYPE_CSV)
 
48
    :file_name(name), opt_enclosed(0), dumpfile(flag), skip_lines(0)
 
49
  {
 
50
    filetype= filetype_arg;
 
51
    field_term= &default_field_term;
 
52
    enclosed=   line_start= &my_empty_string;
 
53
    line_term=  &default_line_term;
 
54
    escaped=    &default_escaped;
 
55
    cs= NULL;
 
56
  }
56
57
};
57
58
 
58
59
 
59
 
} /* namespace drizzled */
60
 
 
61
60
#endif /* DRIZZLED_FILE_EXCHANGE_H */