← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/file_exchange.h

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/file_exchange.h
25
25
#include "drizzled/memory/sql_alloc.h"
26
26
#include "drizzled/enum.h"
27
27
 
 
28
namespace drizzled
 
29
{
 
30
 
28
31
extern const CHARSET_INFO *default_charset_info;
29
32
 
30
33
static String default_line_term("\n",default_charset_info);
37
40
  XXX: We never call destructor for objects of this class.
38
41
*/
39
42
 
40
 
class file_exchange :public drizzled::memory::SqlAlloc
 
43
class file_exchange :public memory::SqlAlloc
41
44
{
42
45
public:
43
46
  enum enum_filetype filetype; /* load XML, Added by Arnold & Erik */
52
55
};
53
56
 
54
57
 
 
58
} /* namespace drizzled */
 
59
 
55
60
#endif /* DRIZZLED_FILE_EXCHANGE_H */