← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/mf_tempfile.cc

  • Committer: Tim Penhey
  • Date: 2010-02-11 00:28:04 UTC
  • mfrom: (1271.6.2 unify_error)
  • mto: This revision was merged to the branch mainline in revision 1348.
  • Revision ID: tim@penhey.net-20100211002804-l37rv3exdak25taw
Merge prev pipe and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/mf_tempfile.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
#include "drizzled/internal/mysys_priv.h"
 
16
#include "config.h"
 
17
 
 
18
#include "drizzled/internal/my_sys.h"
17
19
#include "drizzled/internal/m_string.h"
18
20
#include "my_static.h"
19
21
#include "drizzled/error.h"
25
27
#endif
26
28
 
27
29
using namespace std;
 
30
namespace drizzled
 
31
{
 
32
namespace internal
 
33
{
28
34
 
29
35
/*
30
36
  @brief
92
98
 
93
99
  return(file);
94
100
}
 
101
 
 
102
} /* namespace internal */
 
103
} /* namespace drizzled */