← 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: 2009-12-21 06:51:50 UTC
  • mto: (1253.2.3 out-of-tree)
  • mto: This revision was merged to the branch mainline in revision 1250.
  • Revision ID: mordred@inaugust.com-20091221065150-n4qv83u5ku45wrat
Removed sql_string.h from server_includes.h.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/file_exchange.h
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
22
22
#define DRIZZLED_FILE_EXCHANGE_H
23
23
 
24
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;
 
25
#include "drizzled/sql_alloc.h"
32
26
 
33
27
static String default_line_term("\n",default_charset_info);
34
28
static String default_escaped("\\",default_charset_info);
40
34
  XXX: We never call destructor for objects of this class.
41
35
*/
42
36
 
43
 
class file_exchange :
44
 
  public memory::SqlAlloc
 
37
class file_exchange :public Sql_alloc
45
38
{
46
39
public:
47
40
  enum enum_filetype filetype; /* load XML, Added by Arnold & Erik */
56
49
};
57
50
 
58
51
 
59
 
} /* namespace drizzled */
60
 
 
61
52
#endif /* DRIZZLED_FILE_EXCHANGE_H */