← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.cc
25
25
 
26
26
#include "drizzled/sql_string.h"
27
27
 
 
28
using namespace drizzled;
28
29
using namespace std;
29
30
 
30
31
/*****************************************************************************
81
82
    str_charset(str.str_charset)
82
83
{ }
83
84
 
84
 
void *String::operator new(size_t size, MEM_ROOT *mem_root)
 
85
void *String::operator new(size_t size, memory::Root *mem_root)
85
86
{
86
87
  return alloc_root(mem_root, static_cast<uint32_t>(size));
87
88
}