← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.cc

  • Committer: Brian Aker
  • Date: 2011-01-11 07:12:09 UTC
  • mfrom: (2068.5.6 catalogs)
  • Revision ID: brian@gir-3-20110111071209-ntbex8btgayoq00v
Merge in catalogs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.cc
219
219
  return false;
220
220
}
221
221
 
 
222
bool String::copy(const std::string& arg, const CHARSET_INFO * const cs)        // Allocate new string
 
223
{
 
224
  if (alloc(arg.size()))
 
225
    return true;
 
226
 
 
227
  if ((str_length= arg.size()))
 
228
    memcpy(Ptr, arg.c_str(), arg.size());
 
229
 
 
230
  Ptr[arg.size()]= 0;
 
231
  str_charset= cs;
 
232
 
 
233
  return false;
 
234
}
 
235
 
222
236
bool String::copy(const char *str,size_t arg_length, const CHARSET_INFO * const cs)
223
237
{
224
238
  if (alloc(arg_length))