← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/file_exchange.h

  • Committer: Brian Aker
  • Date: 2009-12-03 01:17:53 UTC
  • mto: (1237.3.2 push)
  • mto: This revision was merged to the branch mainline in revision 1238.
  • Revision ID: brian@gaz-20091203011753-159h2no5m5c5dt9b
Small cleanups, did in MERGE table only engine flag.

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;
32
24
 
33
25
static String default_line_term("\n",default_charset_info);
34
26
static String default_escaped("\\",default_charset_info);
40
32
  XXX: We never call destructor for objects of this class.
41
33
*/
42
34
 
43
 
class file_exchange :public memory::SqlAlloc
 
35
class file_exchange :public Sql_alloc
44
36
{
45
37
public:
46
38
  enum enum_filetype filetype; /* load XML, Added by Arnold & Erik */
55
47
};
56
48
 
57
49
 
58
 
} /* namespace drizzled */
59
 
 
60
50
#endif /* DRIZZLED_FILE_EXCHANGE_H */