← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.cc

  • Committer: David Shrewsbury
  • Date: 2010-10-11 17:20:14 UTC
  • mfrom: (1838 trunk-drizzle)
  • mto: (1838.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1839.
  • Revision ID: shrewsbury.dave@gmail.com-20101011172014-sij1m2doi2fl2duo
Merge from trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.cc
117
117
  str_length=0;
118
118
  if (Alloced_length < arg_length)
119
119
  {
120
 
    if (Alloced_length > 0)
121
 
      free();
 
120
    free();
122
121
    if (!(Ptr=(char*) malloc(arg_length)))
123
122
      return true;
124
123
    Alloced_length=arg_length;
230
229
  return false;
231
230
}
232
231
 
 
232
 
233
233
/*
234
234
  Checks that the source string can be just copied to the destination string
235
235
  without conversion.