← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.h

  • Committer: Brian Aker
  • Date: 2009-12-30 02:36:33 UTC
  • mfrom: (1253.2.5 out-of-tree)
  • Revision ID: brian@gaz-20091230023633-lwnumq83u8h2y56q
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.h
78
78
  static void operator delete(void *, size_t)
79
79
  { }
80
80
  static void operator delete(void *, drizzled::memory::Root *)
81
 
  { /* never called */ }
 
81
  { }
82
82
  ~String();
83
83
 
84
84
  inline void set_charset(const CHARSET_INFO * const charset_arg)