~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/conv.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
 
20
20
#include "config.h"
21
21
#include <drizzled/function/str/conv.h>
22
 
#include "mystrings/m_string.h"
 
22
#include "drizzled/internal/m_string.h"
23
23
 
24
24
String *Item_func_conv::val_str(String *str)
25
25
{