← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.cc

  • Committer: Monty Taylor
  • Date: 2008-12-04 01:52:59 UTC
  • mto: This revision was merged to the branch mainline in revision 649.
  • Revision ID: monty@inaugust.com-20081204015259-b90660chfn9unkg1
Removed some my_malloc calls.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.cc
42
42
  if (Alloced_length < arg_length)
43
43
  {
44
44
    free();
45
 
    if (!(Ptr=(char*) my_malloc(arg_length,MYF(MY_WME))))
 
45
    if (!(Ptr=(char*) malloc(arg_length)))
46
46
      return true;
47
47
    Alloced_length=arg_length;
48
48
    alloced=1;
73
73
      else
74
74
        return true;                            // Signal error
75
75
    }
76
 
    else if ((new_ptr= (char*) my_malloc(len,MYF(MY_WME))))
 
76
    else if ((new_ptr= (char*) malloc(len)))
77
77
    {
78
78
      if (str_length)                           // Avoid bugs in memcpy on AIX
79
79
        memcpy(new_ptr,Ptr,str_length);