← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.h

  • Committer: Stewart Smith
  • Date: 2011-01-21 01:09:12 UTC
  • mfrom: (2099 staging)
  • mto: (2099.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2100.
  • Revision ID: stewart@flamingspork.com-20110121010912-x5ogi8rm08nortxp
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.h
246
246
 
247
247
  bool copy();                                  // Alloc string if not alloced
248
248
  bool copy(const String &s);                   // Allocate new string
 
249
  bool copy(const std::string&, const CHARSET_INFO * const cs); // Allocate new string
249
250
  bool copy(const char *s,size_t arg_length, const CHARSET_INFO * const cs);    // Allocate new string
250
251
  static bool needs_conversion(size_t arg_length,
251
252
                               const CHARSET_INFO * const cs_from, const CHARSET_INFO * const cs_to,
252
253
                               size_t *offset);
253
254
  bool set_or_copy_aligned(const char *s, size_t arg_length, const CHARSET_INFO * const cs);
254
255
  bool copy(const char*s,size_t arg_length, const CHARSET_INFO * const csfrom,
255
 
            const CHARSET_INFO * const csto, size_t *errors);
 
256
            const CHARSET_INFO * const csto, size_t *errors);
256
257
  bool append(const String &s);
257
258
  bool append(const char *s);
258
259
  bool append(const char *s,size_t arg_length);