← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/memory/multi_malloc.cc

  • Committer: Brian Aker
  • Date: 2011-02-12 06:13:32 UTC
  • mto: This revision was merged to the branch mainline in revision 2161.
  • Revision ID: brian@tangent.org-20110212061332-a5dtetim82r6vvls
Merge in session up and out of sql_select.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/memory/multi_malloc.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
 
#include <config.h>
 
16
#include "config.h"
17
17
 
18
18
#include <stdarg.h>
19
19
#include <string.h>
20
20
#include <stdlib.h>
21
21
 
22
 
#include <drizzled/memory/multi_malloc.h>
23
 
#include <drizzled/definitions.h>
 
22
#include "drizzled/memory/multi_malloc.h"
 
23
#include "drizzled/definitions.h"
24
24
 
25
25
namespace drizzled
26
26
{