← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.h

  • Committer: Mark Atwood
  • Date: 2011-10-08 04:50:51 UTC
  • mfrom: (2430.1.1 rf)
  • Revision ID: me@mark.atwood.name-20111008045051-6ha1qiy7k2a9c3jv
Tags: 2011.10.27
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.h
30
30
#include <string>
31
31
 
32
32
#include <drizzled/visibility.h>
33
 
#include <drizzled/common_fwd.h>
34
33
 
35
34
#ifndef NOT_FIXED_DEC
36
35
#define NOT_FIXED_DEC                   (uint8_t)31
64
63
public:
65
64
  String();
66
65
  String(size_t length_arg);
67
 
  String(const char*, const charset_info_st*);
68
 
  String(const char*, size_t, const charset_info_st*);
69
 
  String(char *str, size_t len, const charset_info_st*);
70
 
  String(str_ref, const charset_info_st*);
71
 
  String(const String&);
 
66
  String(const char *str, const charset_info_st * const cs);
 
67
  String(const char *str, size_t len, const charset_info_st * const cs);
 
68
  String(char *str, size_t len, const charset_info_st * const cs);
 
69
  String(const String &str);
72
70
 
73
71
  static void *operator new(size_t size, memory::Root *mem_root);
74
72
  static void operator delete(void *, size_t)