← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/memory/root.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/memory/root.cc
15
15
 
16
16
/* Routines to handle mallocing of results which will be freed the same time */
17
17
 
18
 
#include "mysys/mysys_priv.h"
19
 
#include <mystrings/m_string.h>
 
18
#include "drizzled/internal/mysys_priv.h"
 
19
#include "drizzled/internal/m_string.h"
20
20
 
21
21
#include <algorithm>
22
22