~eday/drizzle/eday-dev

« back to all changes in this revision

Viewing changes to drizzled/file_exchange.h

  • Committer: Eric Day
  • Date: 2010-01-07 20:02:38 UTC
  • mfrom: (971.3.291 staging)
  • Revision ID: eday@oddments.org-20100107200238-uqw8v6kv9pl7nny5
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
extern const CHARSET_INFO *default_charset_info;
24
29
 
25
30
static String default_line_term("\n",default_charset_info);
26
31
static String default_escaped("\\",default_charset_info);
32
37
  XXX: We never call destructor for objects of this class.
33
38
*/
34
39
 
35
 
class file_exchange :public Sql_alloc
 
40
class file_exchange :public drizzled::memory::SqlAlloc
36
41
{
37
42
public:
38
43
  enum enum_filetype filetype; /* load XML, Added by Arnold & Erik */