← 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-18 16:54:23 UTC
  • mfrom: (2440.2.4 rf)
  • Revision ID: me@mark.atwood.name-20111018165423-vboh6wowjnvn434f
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.h
63
63
public:
64
64
  String();
65
65
  String(size_t length_arg);
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);
 
66
  String(const char*, const charset_info_st*);
 
67
  String(const char*, size_t, const charset_info_st*);
 
68
  String(char *str, size_t len, const charset_info_st*);
 
69
  String(str_ref, const charset_info_st*);
 
70
  String(const String&);
70
71
 
71
72
  static void *operator new(size_t size, memory::Root *mem_root);
72
73
  static void operator delete(void *, size_t)