← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.cc

Merged from Mats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.cc
137
137
  if (alloc(str.str_length))
138
138
    return true;
139
139
  str_length=str.str_length;
140
 
  bmove(Ptr,str.Ptr,str_length);                // May be overlapping
 
140
  memmove(Ptr, str.Ptr, str_length);            // May be overlapping
141
141
  Ptr[str_length]=0;
142
142
  str_charset=str.str_charset;
143
143
  return false;
326
326
  {
327
327
    if (realloc(max_length))
328
328
      return true;
329
 
    bfill(Ptr+str_length,max_length-str_length,fill_char);
 
329
    memset(Ptr+str_length, fill_char, max_length-str_length);
330
330
    str_length=max_length;
331
331
  }
332
332
  return false;
448
448
  t_length= full_length - arg_length;
449
449
  if (t_length > 0)
450
450
  {
451
 
    bfill(Ptr+str_length, t_length, fill_char);
 
451
    memset(Ptr+str_length, fill_char, t_length);
452
452
    str_length=str_length + t_length;
453
453
  }
454
454
  append(s, arg_length);
545
545
    {
546
546
      if (to_length)
547
547
        memcpy(Ptr+offset,to,to_length);
548
 
      bmove(Ptr+offset+to_length,Ptr+offset+arg_length,
549
 
            str_length-offset-arg_length);
 
548
      memcpy(Ptr+offset+to_length, Ptr+offset+arg_length,
 
549
             str_length-offset-arg_length);
550
550
    }
551
551
    else
552
552
    {