← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.cc

Merged null-not-zero-as-pointer into remove-bit_fields_as_long.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.cc
18
18
 */
19
19
 
20
20
#include "config.h"
21
 
#include CSTDINT_H
 
21
 
22
22
#include <drizzled/session.h>
23
23
#include <drizzled/error.h>
24
24
#include <drizzled/item/string.h>
25
25
 
 
26
namespace drizzled
 
27
{
 
28
 
26
29
Item *Item_string::safe_charset_converter(const CHARSET_INFO * const tocs)
27
30
{
28
31
  Item_string *conv;
172
175
}
173
176
 
174
177
 
175
 
 
 
178
} /* namespace drizzled */